From cfa2462eef481e5fcfcf71320ee493c2c299b633 Mon Sep 17 00:00:00 2001
From: Waheed Ahmad <waheed.ahmad92@outlook.com>
Date: Wed, 4 Feb 2026 20:34:17 +0500
Subject: [PATCH 01/17] set options menu command in code behind

---
 src/TableView.Properties.cs                   |  15 +-
 src/TableViewHeaderRow.OptionComamnds.cs      | 147 +++++++++++++++++
 ...bleViewHeaderRow.OptionsFlyoutViewModel.cs | 149 ------------------
 src/TableViewHeaderRow.cs                     |  29 +---
 src/Themes/TableViewHeaderRow.xaml            |  19 +--
 5 files changed, 169 insertions(+), 190 deletions(-)
 create mode 100644 src/TableViewHeaderRow.OptionComamnds.cs
 delete mode 100644 src/TableViewHeaderRow.OptionsFlyoutViewModel.cs

diff --git a/src/TableView.Properties.cs b/src/TableView.Properties.cs
index 6dbf992d..e9e46f24 100644
--- a/src/TableView.Properties.cs
+++ b/src/TableView.Properties.cs
@@ -58,7 +58,7 @@ public partial class TableView
     /// <summary>
     /// Identifies the ShowExportOptions dependency property.
     /// </summary>
-    public static readonly DependencyProperty ShowExportOptionsProperty = DependencyProperty.Register(nameof(ShowExportOptions), typeof(bool), typeof(TableView), new PropertyMetadata(false));
+    public static readonly DependencyProperty ShowExportOptionsProperty = DependencyProperty.Register(nameof(ShowExportOptions), typeof(bool), typeof(TableView), new PropertyMetadata(false, OnShowExportOptionsChanged));
 
     /// <summary>
     /// Identifies the AutoGenerateColumns dependency property.
@@ -262,7 +262,7 @@ public partial class TableView
     /// <summary>
     /// Identifies the <see cref="ShowFilterItemsCount"/> dependency property.
     /// </summary>
-    public static readonly DependencyProperty ShowFilterItemsCountProperty =  DependencyProperty.Register(nameof(ShowFilterItemsCount), typeof(bool), typeof(TableView), new PropertyMetadata(false));
+    public static readonly DependencyProperty ShowFilterItemsCountProperty = DependencyProperty.Register(nameof(ShowFilterItemsCount), typeof(bool), typeof(TableView), new PropertyMetadata(false));
 
     /// <summary>
     /// Gets or sets a value indicating whether opening the column filter over header right-click is enabled.
@@ -820,6 +820,17 @@ private static void OnSelectionModeChanged(DependencyObject d, DependencyPropert
         }
     }
 
+    /// <summary>
+    /// Handles changes to the ShowExportOptions property.
+    /// </summary>
+    private static void OnShowExportOptionsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is TableView tableView)
+        {
+            tableView._headerRow?.SetExportOptionsVisibility();
+        }
+    }
+
     /// <summary>
     /// Handles changes to the AutoGenerateColumns property.
     /// </summary>
diff --git a/src/TableViewHeaderRow.OptionComamnds.cs b/src/TableViewHeaderRow.OptionComamnds.cs
new file mode 100644
index 00000000..76e0c9f6
--- /dev/null
+++ b/src/TableViewHeaderRow.OptionComamnds.cs
@@ -0,0 +1,147 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+
+namespace WinUI.TableView;
+
+partial class TableViewHeaderRow
+{
+    private MenuFlyoutItem? _exportAllMenuItem;
+    private MenuFlyoutItem? _exportSelectedMenuItem;
+    private readonly StandardUICommand _selectAllCommand = new(StandardUICommandKind.SelectAll) { Label = TableViewLocalizedStrings.SelectAll };
+    private readonly StandardUICommand _deselectAllCommand = new() { Label = TableViewLocalizedStrings.DeselectAll };
+    private readonly StandardUICommand _copyCommand = new(StandardUICommandKind.Copy) { Label = TableViewLocalizedStrings.Copy };
+    private readonly StandardUICommand _copyWithHeadersCommand = new() { Label = TableViewLocalizedStrings.CopyWithHeaders };
+    private readonly StandardUICommand _clearSortingCommand = new() { Label = TableViewLocalizedStrings.ClearSorting };
+    private readonly StandardUICommand _clearFilterCommand = new() { Label = TableViewLocalizedStrings.ClearFilter };
+    private readonly StandardUICommand _exportAllToCSVCommand = new() { Label = TableViewLocalizedStrings.ExportAll };
+    private readonly StandardUICommand _exportSelectedToCSVCommand = new() { Label = TableViewLocalizedStrings.ExportSelected };
+
+    /// <summary>
+    /// Sets the visibility of the export options.
+    /// </summary>
+    internal void SetExportOptionsVisibility()
+    {
+        var visibility = TableView?.ShowExportOptions is true ? Visibility.Visible : Visibility.Collapsed;
+
+        if (_exportAllMenuItem is not null)
+        {
+            _exportAllMenuItem.Visibility = visibility;
+        }
+
+        if (_exportSelectedMenuItem is not null)
+        {
+            _exportSelectedMenuItem.Visibility = visibility;
+        }
+    }
+
+    /// <summary>
+    /// Sets commands to option menu items.
+    /// </summary>
+    private void SetOptionMenuCommands()
+    {
+        InitializeCommands();
+
+        if (GetTemplateChild("SelectAllMenuItem") is MenuFlyoutItem selectAllMenuItem)
+            selectAllMenuItem.Command = _selectAllCommand;
+        if (GetTemplateChild("ClearSelectionMenuItem") is MenuFlyoutItem clearSelectionMenuItem) 
+            clearSelectionMenuItem.Command = _deselectAllCommand;
+        if (GetTemplateChild("CopyMenuItem") is MenuFlyoutItem copyMenuItem) 
+            copyMenuItem.Command = _copyCommand;
+        if (GetTemplateChild("CopyWithHeadersMenuItem") is MenuFlyoutItem copyWithHeadersMenuItem) 
+            copyWithHeadersMenuItem.Command = _copyWithHeadersCommand;
+        if (GetTemplateChild("ClearSortingMenuItem") is MenuFlyoutItem clearSortingMenuItem) 
+            clearSortingMenuItem.Command = _clearSortingCommand;
+        if (GetTemplateChild("ClearFilterMenuItem") is MenuFlyoutItem clearFilterMenuItem) 
+            clearFilterMenuItem.Command = _clearFilterCommand;
+        if (GetTemplateChild("ExportAllMenuItem") is MenuFlyoutItem exportAllMenuItem)
+        {
+            _exportAllMenuItem = exportAllMenuItem;
+            exportAllMenuItem.Command = _exportAllToCSVCommand;
+        }
+        if (GetTemplateChild("ExportSelectedMenuItem") is MenuFlyoutItem exportSelectedMenuItem)
+        {
+            _exportSelectedMenuItem = exportSelectedMenuItem;
+            exportSelectedMenuItem.Command = _exportSelectedToCSVCommand;
+        }
+    }
+
+    /// <summary>
+    /// Initializes the commands for the ViewModel.
+    /// </summary>
+    private void InitializeCommands()
+    {
+        _selectAllCommand.Description = TableViewLocalizedStrings.SelectAllCommandDescription;
+        _selectAllCommand.ExecuteRequested += delegate { TableView?.SelectAll(); };
+        _selectAllCommand.CanExecuteRequested += CanExecuteSelectAllCommand;
+
+        _deselectAllCommand.Description = TableViewLocalizedStrings.DeselectAllCommandDescription;
+        _deselectAllCommand.ExecuteRequested += delegate { TableView?.DeselectAll(); };
+        _deselectAllCommand.CanExecuteRequested += CanExecuteDeselectAllCommand;
+
+        _copyCommand.Description = TableViewLocalizedStrings.CopyCommandDescription;
+        _copyCommand.ExecuteRequested += ExecuteCopyCommand;
+        _copyCommand.CanExecuteRequested += CanExecuteCopyCommand;
+
+        _copyWithHeadersCommand.Description = TableViewLocalizedStrings.CopyWithHeadersCommandDescription;
+        _copyWithHeadersCommand.ExecuteRequested += delegate { TableView?.CopyToClipboardInternal(true); };
+        _copyWithHeadersCommand.CanExecuteRequested += CanExecuteCopyWithHeadersCommand;
+
+        _clearSortingCommand.ExecuteRequested += delegate { TableView?.ClearAllSortingWithEvent(); };
+        _clearSortingCommand.CanExecuteRequested += CanExecuteClearSortingCommand;
+
+        _clearFilterCommand.ExecuteRequested += delegate { TableView?.FilterHandler.ClearFilter(default); };
+        _clearFilterCommand.CanExecuteRequested += CanExecuteClearFilterCommand;
+
+        _exportAllToCSVCommand.ExecuteRequested += delegate { TableView?.ExportAllToCSV(); };
+
+        _exportSelectedToCSVCommand.ExecuteRequested += delegate { TableView?.ExportSelectedToCSV(); };
+        _exportSelectedToCSVCommand.CanExecuteRequested += CanExecuteExportSelectedToCSVCommand;
+    }
+
+    private void CanExecuteSelectAllCommand(XamlUICommand sender, CanExecuteRequestedEventArgs e)
+    {
+        e.CanExecute = TableView?.IsEditing is false && TableView.SelectionMode is ListViewSelectionMode.Multiple or ListViewSelectionMode.Extended;
+    }
+
+    private void CanExecuteDeselectAllCommand(XamlUICommand sender, CanExecuteRequestedEventArgs e)
+    {
+        e.CanExecute = TableView?.IsEditing is false && (TableView.SelectedItems.Count > 0 || TableView.SelectedCells.Count > 0);
+    }
+
+    private void ExecuteCopyCommand(XamlUICommand sender, ExecuteRequestedEventArgs e)
+    {
+        var focusedElement = FocusManager.GetFocusedElement(TableView?.XamlRoot!);
+        if (focusedElement is FrameworkElement { Parent: TableViewCell })
+        {
+            return;
+        }
+
+        TableView?.CopyToClipboardInternal(false);
+    }
+
+    private void CanExecuteCopyCommand(XamlUICommand sender, CanExecuteRequestedEventArgs e)
+    {
+        e.CanExecute = TableView?.SelectedItems.Count > 0 || TableView?.SelectedCells.Count > 0 || TableView?.CurrentCellSlot.HasValue is true;
+    }
+
+    private void CanExecuteCopyWithHeadersCommand(XamlUICommand sender, CanExecuteRequestedEventArgs e)
+    {
+        e.CanExecute = TableView?.SelectedItems.Count > 0 || TableView?.SelectedCells.Count > 0 || TableView?.CurrentCellSlot.HasValue is true;
+    }
+
+    private void CanExecuteClearSortingCommand(XamlUICommand sender, CanExecuteRequestedEventArgs e)
+    {
+        e.CanExecute = TableView?.IsEditing is false && TableView.IsSorted;
+    }
+
+    private void CanExecuteClearFilterCommand(XamlUICommand sender, CanExecuteRequestedEventArgs e)
+    {
+        e.CanExecute = TableView?.IsEditing is false && TableView.IsFiltered;
+    }
+
+    private void CanExecuteExportSelectedToCSVCommand(XamlUICommand sender, CanExecuteRequestedEventArgs e)
+    {
+        e.CanExecute = TableView?.IsEditing is false && (TableView.SelectedItems.Count > 0 || TableView.SelectedCells.Count > 0 || TableView.CurrentCellSlot.HasValue);
+    }
+}
diff --git a/src/TableViewHeaderRow.OptionsFlyoutViewModel.cs b/src/TableViewHeaderRow.OptionsFlyoutViewModel.cs
deleted file mode 100644
index 26124c09..00000000
--- a/src/TableViewHeaderRow.OptionsFlyoutViewModel.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Input;
-using System;
-
-namespace WinUI.TableView;
-
-public partial class TableViewHeaderRow
-{
-    /// <summary>
-    /// ViewModel for the options flyout in the TableViewHeaderRow.
-    /// </summary>
-    private class OptionsFlyoutViewModel
-    {
-        /// <summary>
-        /// Initializes a new instance of the OptionsFlyoutViewModel class.
-        /// </summary>
-        /// <param name="_tableView">The TableView associated with the ViewModel.</param>
-        public OptionsFlyoutViewModel(TableView _tableView)
-        {
-            InitializeCommands();
-            TableView = _tableView;
-        }
-
-        /// <summary>
-        /// Initializes the commands for the ViewModel.
-        /// </summary>
-        private void InitializeCommands()
-        {
-            SelectAllCommand.Description = TableViewLocalizedStrings.SelectAllCommandDescription;
-            SelectAllCommand.ExecuteRequested += delegate { TableView.SelectAll(); };
-            SelectAllCommand.CanExecuteRequested += CanExecuteSelectAllCommand;
-
-            DeselectAllCommand.Description = TableViewLocalizedStrings.DeselectAllCommandDescription;
-            DeselectAllCommand.ExecuteRequested += delegate { TableView.DeselectAll(); };
-            DeselectAllCommand.CanExecuteRequested += CanExecuteDeselectAllCommand;
-
-            CopyCommand.Description = TableViewLocalizedStrings.CopyCommandDescription;
-            CopyCommand.ExecuteRequested += ExecuteCopyCommand;
-            CopyCommand.CanExecuteRequested += CanExecuteCopyCommand;
-
-            CopyWithHeadersCommand.Description = TableViewLocalizedStrings.CopyWithHeadersCommandDescription;
-            CopyWithHeadersCommand.ExecuteRequested += delegate { TableView.CopyToClipboardInternal(true); };
-            CopyWithHeadersCommand.CanExecuteRequested += CanExecuteCopyWithHeadersCommand;
-
-            ClearSortingCommand.ExecuteRequested += delegate { TableView.ClearAllSortingWithEvent(); };
-            ClearSortingCommand.CanExecuteRequested += CanExecuteClearSortingCommand;
-
-            ClearFilterCommand.ExecuteRequested += delegate { TableView.FilterHandler.ClearFilter(default); };
-            ClearFilterCommand.CanExecuteRequested += CanExecuteClearFilterCommand;
-
-            ExportAllToCSVCommand.ExecuteRequested += delegate { TableView.ExportAllToCSV(); };
-
-            ExportSelectedToCSVCommand.ExecuteRequested += delegate { TableView.ExportSelectedToCSV(); };
-            ExportSelectedToCSVCommand.CanExecuteRequested += CanExecuteExportSelectedToCSVCommand;
-        }
-
-        private void CanExecuteSelectAllCommand(XamlUICommand sender, CanExecuteRequestedEventArgs e)
-        {
-            e.CanExecute = !TableView.IsEditing && TableView.SelectionMode is ListViewSelectionMode.Multiple or ListViewSelectionMode.Extended;
-        }
-
-        private void CanExecuteDeselectAllCommand(XamlUICommand sender, CanExecuteRequestedEventArgs e)
-        {
-            e.CanExecute = !TableView.IsEditing && (TableView.SelectedItems.Count > 0 || TableView.SelectedCells.Count > 0);
-        }
-
-        private void ExecuteCopyCommand(XamlUICommand sender, ExecuteRequestedEventArgs e)
-        {
-            var focusedElement = FocusManager.GetFocusedElement(TableView.XamlRoot!); 
-            if (focusedElement is FrameworkElement { Parent: TableViewCell })
-            {
-                return;
-            }
-
-            TableView.CopyToClipboardInternal(false);
-        }
-
-        private void CanExecuteCopyCommand(XamlUICommand sender, CanExecuteRequestedEventArgs e)
-        {
-            e.CanExecute = TableView.SelectedItems.Count > 0 || TableView.SelectedCells.Count > 0 || TableView.CurrentCellSlot.HasValue;
-        }
-
-        private void CanExecuteCopyWithHeadersCommand(XamlUICommand sender, CanExecuteRequestedEventArgs e)
-        {
-            e.CanExecute = TableView.SelectedItems.Count > 0 || TableView.SelectedCells.Count > 0 || TableView.CurrentCellSlot.HasValue;
-        }
-
-        private void CanExecuteClearSortingCommand(XamlUICommand sender, CanExecuteRequestedEventArgs e)
-        {
-            e.CanExecute = !TableView.IsEditing && TableView.IsSorted;
-        }
-
-        private void CanExecuteClearFilterCommand(XamlUICommand sender, CanExecuteRequestedEventArgs e)
-        {
-            e.CanExecute = !TableView.IsEditing && TableView.IsFiltered;
-        }
-
-        private void CanExecuteExportSelectedToCSVCommand(XamlUICommand sender, CanExecuteRequestedEventArgs e)
-        {
-            e.CanExecute = !TableView.IsEditing && (TableView.SelectedItems.Count > 0 || TableView.SelectedCells.Count > 0 || TableView.CurrentCellSlot.HasValue);
-        }
-
-        /// <summary>
-        /// Gets the command to select all rows.
-        /// </summary>
-        public StandardUICommand SelectAllCommand { get; } = new(StandardUICommandKind.SelectAll) { Label = TableViewLocalizedStrings.SelectAll };
-
-        /// <summary>
-        /// Gets the command to deselect all rows.
-        /// </summary>
-        public StandardUICommand DeselectAllCommand { get; } = new() { Label = TableViewLocalizedStrings.DeselectAll };
-
-        /// <summary>
-        /// Gets the command to copy the selected row's content to the clipboard.
-        /// </summary>
-        public StandardUICommand CopyCommand { get; } = new(StandardUICommandKind.Copy) { Label = TableViewLocalizedStrings.Copy };
-
-        /// <summary>
-        /// Gets the command to copy the selected row's content including column headers to the clipboard.
-        /// </summary>
-        public StandardUICommand CopyWithHeadersCommand { get; } = new() { Label = TableViewLocalizedStrings.CopyWithHeaders };
-
-        /// <summary>
-        /// Gets the command to clear sorting.
-        /// </summary>
-        public StandardUICommand ClearSortingCommand { get; } = new() { Label = TableViewLocalizedStrings.ClearSorting };
-
-        /// <summary>
-        /// Gets the command to clear filters.
-        /// </summary>
-        public StandardUICommand ClearFilterCommand { get; } = new() { Label = TableViewLocalizedStrings.ClearFilter };
-
-        /// <summary>
-        /// Gets the command to export all content to a CSV file.
-        /// </summary>
-        public StandardUICommand ExportAllToCSVCommand { get; } = new() { Label = TableViewLocalizedStrings.ExportAll };
-
-        /// <summary>
-        /// Gets the command to export selected content to a CSV file.
-        /// </summary>
-        public StandardUICommand ExportSelectedToCSVCommand { get; } = new() { Label = TableViewLocalizedStrings.ExportSelected };
-
-        /// <summary>
-        /// Gets the TableView associated with the ViewModel.
-        /// </summary>
-        public TableView TableView { get; }
-    }
-}
diff --git a/src/TableViewHeaderRow.cs b/src/TableViewHeaderRow.cs
index 1224f92b..0a6bb040 100644
--- a/src/TableViewHeaderRow.cs
+++ b/src/TableViewHeaderRow.cs
@@ -70,11 +70,6 @@ protected override void OnApplyTemplate()
             return;
         }
 
-        if (_optionsButton is not null)
-        {
-            _optionsButton.DataContext = new OptionsFlyoutViewModel(TableView);
-        }
-
         if (GetTemplateChild("selectAllButton") is Button selectAllButton)
         {
             selectAllButton.Tapped += OnSelectAllButtonClicked;
@@ -97,6 +92,7 @@ protected override void OnApplyTemplate()
             Path = new PropertyPath(nameof(TableView.CellsHorizontalOffset))
         });
 
+        SetOptionMenuCommands();
         SetExportOptionsVisibility();
         SetCornerButtonState();
         SetHeadersVisibility();
@@ -364,29 +360,6 @@ internal void CalculateHeaderWidths()
         }
     }
 
-    /// <summary>
-    /// Sets the visibility of the export options.
-    /// </summary>
-    private void SetExportOptionsVisibility()
-    {
-        var binding = new Binding
-        {
-            Path = new PropertyPath(nameof(TableView.ShowExportOptions)),
-            Source = TableView,
-            Converter = new BoolToVisibilityConverter()
-        };
-
-        if (GetTemplateChild("ExportAllMenuItem") is MenuFlyoutItem exportAll)
-        {
-            exportAll.SetBinding(VisibilityProperty, binding);
-        }
-
-        if (GetTemplateChild("ExportSelectedMenuItem") is MenuFlyoutItem exportSelected)
-        {
-            exportSelected.SetBinding(VisibilityProperty, binding);
-        }
-    }
-
     /// <summary>
     /// Handles the selection changed event for the TableView.
     /// </summary>
diff --git a/src/Themes/TableViewHeaderRow.xaml b/src/Themes/TableViewHeaderRow.xaml
index f68da69b..577a25d0 100644
--- a/src/Themes/TableViewHeaderRow.xaml
+++ b/src/Themes/TableViewHeaderRow.xaml
@@ -81,7 +81,6 @@
                         </VisualStateManager.VisualStateGroups>
 
                         <Grid x:Name="CornerButtonPanel">
-
                             <Button x:Name="selectAllButton"
                                     BorderThickness="0"
                                     Background="Transparent"
@@ -120,14 +119,14 @@
                                 </FontIcon>
                                 <Button.Flyout>
                                     <MenuFlyout Placement="BottomEdgeAlignedLeft">
-                                        <MenuFlyoutItem Command="{Binding SelectAllCommand}">
+                                        <MenuFlyoutItem x:Name="SelectAllMenuItem">
                                             <MenuFlyoutItem.KeyboardAccelerators>
                                                 <KeyboardAccelerator Key="A"
                                                                      Modifiers="Control"
                                                                      ScopeOwner="{TemplateBinding TableView}" />
                                             </MenuFlyoutItem.KeyboardAccelerators>
                                         </MenuFlyoutItem>
-                                        <MenuFlyoutItem Command="{Binding DeselectAllCommand}"
+                                        <MenuFlyoutItem x:Name="ClearSelectionMenuItem"
                                                         Icon="ClearSelection">
                                             <MenuFlyoutItem.KeyboardAccelerators>
                                                 <KeyboardAccelerator Key="A"
@@ -135,7 +134,7 @@
                                             </MenuFlyoutItem.KeyboardAccelerators>
                                         </MenuFlyoutItem>
                                         <MenuFlyoutSeparator />
-                                        <MenuFlyoutItem Command="{Binding CopyCommand}"
+                                        <MenuFlyoutItem x:Name="CopyMenuItem"
                                                         Icon="Copy">
                                             <MenuFlyoutItem.KeyboardAccelerators>
                                                 <KeyboardAccelerator Key="C"
@@ -143,24 +142,22 @@
                                                                      ScopeOwner="{TemplateBinding TableView}" />
                                             </MenuFlyoutItem.KeyboardAccelerators>
                                         </MenuFlyoutItem>
-                                        <MenuFlyoutItem Command="{Binding CopyWithHeadersCommand}">
+                                        <MenuFlyoutItem x:Name="CopyWithHeadersMenuItem">
                                             <MenuFlyoutItem.KeyboardAccelerators>
                                                 <KeyboardAccelerator Key="C"
                                                                      Modifiers="Control,Shift" />
                                             </MenuFlyoutItem.KeyboardAccelerators>
                                         </MenuFlyoutItem>
                                         <MenuFlyoutSeparator />
-                                        <MenuFlyoutItem Command="{Binding ClearSortingCommand}" />
-                                        <MenuFlyoutItem Command="{Binding ClearFilterCommand}" />
+                                        <MenuFlyoutItem x:Name="ClearSortingMenuItem" />
+                                        <MenuFlyoutItem x:Name="ClearFilterMenuItem" />
                                         <MenuFlyoutSeparator Visibility="{Binding Visibility, ElementName=ExportAllMenuItem}" />
-                                        <MenuFlyoutItem x:Name="ExportAllMenuItem"
-                                                        Command="{Binding ExportAllToCSVCommand}">
+                                        <MenuFlyoutItem x:Name="ExportAllMenuItem">
                                             <MenuFlyoutItem.Icon>
                                                 <FontIcon Glyph="&#xede1;" />
                                             </MenuFlyoutItem.Icon>
                                         </MenuFlyoutItem>
-                                        <MenuFlyoutItem x:Name="ExportSelectedMenuItem"
-                                                        Command="{Binding ExportSelectedToCSVCommand}">
+                                        <MenuFlyoutItem x:Name="ExportSelectedMenuItem">
                                             <MenuFlyoutItem.Icon>
                                                 <FontIcon Glyph="&#xede1;" />
                                             </MenuFlyoutItem.Icon>

From 08411d8c50af6a085d978ce4b29ffd39d66f01f7 Mon Sep 17 00:00:00 2001
From: Waheed Ahmad <waheed.ahmad92@outlook.com>
Date: Fri, 6 Feb 2026 21:56:35 +0500
Subject: [PATCH 02/17] renamed file name of TableViewFilterItem type

---
 ...ableViewColumnHeader.FilterItem.cs => TableViewFilterItem.cs} | 1 -
 1 file changed, 1 deletion(-)
 rename src/{TableViewColumnHeader.FilterItem.cs => TableViewFilterItem.cs} (99%)

diff --git a/src/TableViewColumnHeader.FilterItem.cs b/src/TableViewFilterItem.cs
similarity index 99%
rename from src/TableViewColumnHeader.FilterItem.cs
rename to src/TableViewFilterItem.cs
index 48ea7358..2f8ccdd6 100644
--- a/src/TableViewColumnHeader.FilterItem.cs
+++ b/src/TableViewFilterItem.cs
@@ -48,7 +48,6 @@ public bool IsSelected
     /// </summary>
     public int Count { get; set; }
 
-
     /// <inheritdoc/>
     public override string ToString()
     {

From 44fcc4211022315c3c3ecd190e96f6c4e4b00698 Mon Sep 17 00:00:00 2001
From: Waheed Ahmad <waheed.ahmad92@outlook.com>
Date: Fri, 6 Feb 2026 22:01:43 +0500
Subject: [PATCH 03/17] set filter flyout commands in code behind

---
 src/TableViewColumnHeader.OptionComamnds.cs | 70 +++++++++++++++++++++
 src/Themes/TableViewColumnHeader.xaml       | 14 ++---
 2 files changed, 77 insertions(+), 7 deletions(-)
 create mode 100644 src/TableViewColumnHeader.OptionComamnds.cs

diff --git a/src/TableViewColumnHeader.OptionComamnds.cs b/src/TableViewColumnHeader.OptionComamnds.cs
new file mode 100644
index 00000000..a90976e9
--- /dev/null
+++ b/src/TableViewColumnHeader.OptionComamnds.cs
@@ -0,0 +1,70 @@
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+using WinUI.TableView.Extensions;
+using SD = WinUI.TableView.SortDirection;
+
+namespace WinUI.TableView;
+
+partial class TableViewColumnHeader
+{
+    private readonly StandardUICommand _sortAscendingCommand = new() { Label = TableViewLocalizedStrings.SortAscending };
+    private readonly StandardUICommand _sortDescendingCommand = new() { Label = TableViewLocalizedStrings.SortDescending };
+    private readonly StandardUICommand _clearSortingCommand = new() { Label = TableViewLocalizedStrings.ClearSorting };
+    private readonly StandardUICommand _clearFilterCommand = new() { Label = TableViewLocalizedStrings.ClearFilter };
+    private readonly StandardUICommand _okCommand = new() { Label = TableViewLocalizedStrings.Ok };
+    private readonly StandardUICommand _cancelCommand = new() { Label = TableViewLocalizedStrings.Cancel };
+
+    /// <summary>
+    /// Sets commands to option menu items.
+    /// </summary>
+    private void SetOptionCommands()
+    {
+        InitializeCommands();
+
+        if (GetTemplateChild("SortAscendingMenuItem") is MenuFlyoutItem sortAscendingMenuItem)
+            sortAscendingMenuItem.Command = _sortAscendingCommand;
+        if (GetTemplateChild("SortDescendingMenuItem") is MenuFlyoutItem sortDescendingMenuItem)
+            sortDescendingMenuItem.Command = _sortDescendingCommand;
+        if (GetTemplateChild("ClearSortingMenuItem") is MenuFlyoutItem clearSortingMenuItem)
+            clearSortingMenuItem.Command = _clearSortingCommand;
+        if (GetTemplateChild("ClearFilterMenuItem") is MenuFlyoutItem clearFilterMenuItem)
+            clearFilterMenuItem.Command = _clearFilterCommand;
+        if (GetTemplateChild("ActionButtonsMenuItem") is MenuFlyoutItem actionButtonsMenuItem)
+        {
+            actionButtonsMenuItem.ApplyTemplate();
+
+            if (actionButtonsMenuItem.FindDescendant<Button>(b => b.Name is "OkButton") is { } okButton)
+                okButton.Command = _okCommand;
+            if (actionButtonsMenuItem.FindDescendant<Button>(b => b.Name is "CancelButton") is { } cancelButton)
+                cancelButton.Command = _cancelCommand;
+        }
+    }
+
+    /// <summary>
+    /// Initializes the commands.
+    /// </summary>
+    private void InitializeCommands()
+    {
+        _sortAscendingCommand.ExecuteRequested += delegate { DoSort(SD.Ascending); };
+        _sortAscendingCommand.CanExecuteRequested += (_, e) => e.CanExecute = CanSort && Column?.SortDirection != SD.Ascending;
+
+        _sortDescendingCommand.ExecuteRequested += delegate { DoSort(SD.Descending); };
+        _sortDescendingCommand.CanExecuteRequested += (_, e) => e.CanExecute = CanSort && Column?.SortDirection != SD.Descending;
+
+        _clearSortingCommand.ExecuteRequested += delegate { ClearSortingWithEvent(); };
+        _clearSortingCommand.CanExecuteRequested += (_, e) => e.CanExecute = Column?.SortDirection is not null;
+
+        _clearFilterCommand.ExecuteRequested += delegate { ClearFilter(); };
+        _clearFilterCommand.CanExecuteRequested += (_, e) => e.CanExecute = Column?.IsFiltered is true;
+
+        _okCommand.ExecuteRequested += delegate { ExecuteOkCommand(); };
+
+        _cancelCommand.ExecuteRequested += delegate { HideFlyout(); };
+    }
+
+    internal void ExecuteOkCommand()
+    {
+        HideFlyout();
+        ApplyFilter();
+    }
+}
diff --git a/src/Themes/TableViewColumnHeader.xaml b/src/Themes/TableViewColumnHeader.xaml
index 239af9e9..24dfccdf 100644
--- a/src/Themes/TableViewColumnHeader.xaml
+++ b/src/Themes/TableViewColumnHeader.xaml
@@ -138,19 +138,19 @@
                                     <Button.Flyout>
                                         <MenuFlyout x:Name="OptionsFlyout"
                                                     Placement="Bottom">
-                                            <MenuFlyoutItem Command="{Binding SortAscendingCommand}">
+                                            <MenuFlyoutItem x:Name="SortAscendingMenuItem">
                                                 <MenuFlyoutItem.Icon>
                                                     <FontIcon Glyph="&#xf0ad;" />
                                                 </MenuFlyoutItem.Icon>
                                             </MenuFlyoutItem>
-                                            <MenuFlyoutItem Command="{Binding SortDescendingCommand}">
+                                            <MenuFlyoutItem x:Name="SortDescendingMenuItem">
                                                 <MenuFlyoutItem.Icon>
                                                     <FontIcon Glyph="&#xf0ae;" />
                                                 </MenuFlyoutItem.Icon>
                                             </MenuFlyoutItem>
-                                            <MenuFlyoutItem Command="{Binding ClearSortingCommand}" />
+                                            <MenuFlyoutItem x:Name="ClearSortingMenuItem" />
                                             <MenuFlyoutSeparator />
-                                            <MenuFlyoutItem Command="{Binding ClearFilterCommand}" />
+                                            <MenuFlyoutItem x:Name="ClearFilterMenuItem" />                                            
                                             <MenuFlyoutItem x:Name="ItemsCheckFlyoutItem">
                                                 <MenuFlyoutItem.Template>
                                                     <ControlTemplate TargetType="MenuFlyoutItem">
@@ -222,7 +222,7 @@
                                                 </MenuFlyoutItem.Template>
                                             </MenuFlyoutItem>
                                             <MenuFlyoutSeparator />
-                                            <MenuFlyoutItem>
+                                            <MenuFlyoutItem x:Name="ActionButtonsMenuItem">
                                                 <MenuFlyoutItem.Template>
                                                     <ControlTemplate TargetType="MenuFlyoutItem">
                                                         <Grid Margin="12,4"
@@ -231,10 +231,10 @@
                                                                 <ColumnDefinition Width="*" />
                                                                 <ColumnDefinition Width="*" />
                                                             </Grid.ColumnDefinitions>
-                                                            <Button Command="{Binding OkCommand}"
+                                                            <Button x:Name="OkButton"
                                                                     HorizontalAlignment="Stretch"
                                                                     Style="{StaticResource AccentButtonStyle}" />
-                                                            <Button Command="{Binding CancelCommand}"
+                                                            <Button x:Name="CancelButton"
                                                                     Grid.Column="1"
                                                                     HorizontalAlignment="Stretch" />
                                                         </Grid>

From 16cc256c925cbe4af85a5faac096d459f17f1ad7 Mon Sep 17 00:00:00 2001
From: Waheed Ahmad <waheed.ahmad92@outlook.com>
Date: Fri, 6 Feb 2026 22:04:52 +0500
Subject: [PATCH 04/17] refactor filter items UI into dedicated UserControl

---
 src/Controls/TableViewFilterItemsControl.xaml |  86 ++++++++
 .../TableViewFilterItemsControl.xaml.cs       | 185 ++++++++++++++++
 ...ViewColumnHeader.OptionsFlyoutViewModel.cs | 200 ------------------
 src/TableViewColumnHeader.cs                  | 129 ++---------
 src/TableViewFilterItem.cs                    |  15 +-
 src/Themes/TableViewColumnHeader.xaml         |  77 +------
 6 files changed, 305 insertions(+), 387 deletions(-)
 create mode 100644 src/Controls/TableViewFilterItemsControl.xaml
 create mode 100644 src/Controls/TableViewFilterItemsControl.xaml.cs
 delete mode 100644 src/TableViewColumnHeader.OptionsFlyoutViewModel.cs

diff --git a/src/Controls/TableViewFilterItemsControl.xaml b/src/Controls/TableViewFilterItemsControl.xaml
new file mode 100644
index 00000000..76b3b6fa
--- /dev/null
+++ b/src/Controls/TableViewFilterItemsControl.xaml
@@ -0,0 +1,86 @@
+<UserControl x:Class="WinUI.TableView.Controls.TableViewFilterItemsControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:not_win="http://uno.ui/not_win"
+             xmlns:converters="using:WinUI.TableView.Converters"
+             xmlns:local="using:WinUI.TableView"
+             mc:Ignorable="not_win d">
+
+    <UserControl.Resources>
+        <converters:BoolToVisibilityConverter x:Key="BoolToVisibility" />
+    </UserControl.Resources>
+
+    <Grid Margin="8,4"
+          Width="250"
+          Height="300">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <TextBox x:Name="searchBox"
+                 PlaceholderText="{x:Bind local:TableViewLocalizedStrings.SearchBoxPlaceholder}"
+                 TextChanged="OnSearchBoxTextChanged"
+                 win:PreviewKeyDown="OnSearchBoxKeyDown"
+                 not_win:KeyDown="OnSearchBoxKeyDown" />
+        <Border Grid.Row="1"
+                BorderThickness="0,0,0,1"
+                BorderBrush="{ThemeResource MenuFlyoutSeparatorBackground}">
+            <CheckBox x:Name="selectAllCheckBox"
+                      Margin="12,8,12,1"
+                      Content="{x:Bind local:TableViewLocalizedStrings.SelectAllParenthesized}" 
+                      Checked="OnSelectAllCheckBoxCheckChanged"
+                      Unchecked="OnSelectAllCheckBoxCheckChanged"/>
+        </Border>
+        <ListView x:Name="filterItemsList"
+                  Grid.Row="2"
+                  SelectionMode="None"
+                  not_win:Margin="12,0,0,0">
+            <ListView.ItemContainerStyle>
+                <Style TargetType="ListViewItem"
+                       BasedOn="{StaticResource DefaultListViewItemStyle}">
+                    <Setter Property="Padding"
+                            Value="12,0" />
+                    <Setter Property="Margin"
+                            Value="0" />
+                    <Setter Property="MinHeight"
+                            Value="36" />
+                    <Setter Property="Height"
+                            Value="36" />
+                    <Setter Property="HorizontalAlignment"
+                            Value="Stretch" />
+                    <Setter Property="HorizontalContentAlignment"
+                            Value="Stretch" />
+                </Style>
+            </ListView.ItemContainerStyle>
+            <ListView.ItemTemplate>
+                <DataTemplate x:DataType="local:TableViewFilterItem">
+                    <CheckBox IsChecked="{x:Bind IsSelected, Mode=TwoWay}"
+                              HorizontalAlignment="Stretch"
+                              HorizontalContentAlignment="Stretch">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+
+                            <TextBlock Text="{x:Bind ValueText}"
+                                       TextWrapping="NoWrap" />
+
+                            <StackPanel Grid.Column="1"
+                                        Orientation="Horizontal"
+                                        Visibility="{x:Bind ShowCount, Converter={StaticResource BoolToVisibility}}">
+                                <TextBlock Text="(" />
+                                <TextBlock Text="{x:Bind Count}" />
+                                <TextBlock Text=")" />
+                            </StackPanel>
+                        </Grid>
+                    </CheckBox>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+        </ListView>
+    </Grid>
+</UserControl>
diff --git a/src/Controls/TableViewFilterItemsControl.xaml.cs b/src/Controls/TableViewFilterItemsControl.xaml.cs
new file mode 100644
index 00000000..ed4446b2
--- /dev/null
+++ b/src/Controls/TableViewFilterItemsControl.xaml.cs
@@ -0,0 +1,185 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Threading.Tasks;
+using Windows.System;
+
+namespace WinUI.TableView.Controls;
+
+/// <summary>
+/// Represents the control that displays filter items in the filter flyout of a TableViewColumnHeader.
+/// </summary>
+public partial class TableViewFilterItemsControl : UserControl
+{
+    private bool _canSetState = true;
+    private ICollection<TableViewFilterItem>? _filterItems;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TableViewFilterItemsControl"/> class.
+    /// </summary>
+    public TableViewFilterItemsControl()
+    {
+        InitializeComponent();
+    }
+
+    /// <summary>
+    /// Initializes the state of the <see cref="TableViewFilterItemsControl"/>.
+    /// </summary>
+    internal async void Initialize()
+    {
+        FilterItems = TableView?.FilterHandler?.GetFilterItems(ColumnHeader?.Column!, null).ToList();
+
+        if (searchBox is not null)
+        {
+            await Task.Delay(100);
+            await FocusManager.TryFocusAsync(searchBox, FocusState.Programmatic);
+        }
+
+        if (filterItemsList is not null && filterItemsList.Items.Count > 0)
+        {
+            filterItemsList.ScrollIntoView(filterItemsList.Items[0]);
+        }
+    }
+
+    /// <summary>
+    /// Clears the search box text.
+    /// </summary>
+    internal void ClearSearchBox()
+    {
+        if (searchBox is not null)
+        {
+            searchBox.Text = string.Empty;
+        }
+    }
+
+    private void OnSearchBoxTextChanged(object sender, TextChangedEventArgs e)
+    {
+        FilterItems = TableView?.FilterHandler?.GetFilterItems(ColumnHeader?.Column!, searchBox!.Text);
+    }
+
+    /// <summary>
+    /// Handles the KeyDown or PreviewKeyDown event for the searchBox.
+    /// </summary>
+    private void OnSearchBoxKeyDown(object sender, KeyRoutedEventArgs e)
+    {
+        if (e.Key == VirtualKey.Enter && searchBox?.Text.Length > 0)
+        {
+            ColumnHeader?.ExecuteOkCommand();
+
+            e.Handled = true;
+        }
+    }
+
+    /// <summary>
+    /// Handles the Checked and Unchecked event for the selectAllCheckBox.
+    /// </summary>
+    private void OnSelectAllCheckBoxCheckChanged(object sender, RoutedEventArgs e)
+    {
+        SetFilterItemsState(selectAllCheckBox.IsChecked is true);
+    }
+
+    /// <summary>
+    /// Sets the state of the select all checkbox.
+    /// </summary>
+    internal void SetSelectAllCheckBoxState()
+    {
+        if (selectAllCheckBox is null || !_canSetState)
+        {
+            return;
+        }
+
+
+        selectAllCheckBox.IsChecked = _filterItems?.All(x => x.IsSelected) ?? false ? true
+                                      : _filterItems?.All(x => !x.IsSelected) ?? false ? false
+                                      : null;
+    }
+
+    /// <summary>
+    /// Sets the state of the filter items.
+    /// </summary>
+    /// <param name="isSelected">The state to set.</param>
+    internal void SetFilterItemsState(bool isSelected)
+    {
+        _canSetState = false;
+
+        foreach (var item in filterItemsList.Items.OfType<TableViewFilterItem>())
+        {
+            item.IsSelected = isSelected;
+        }
+
+        _canSetState = true;
+    }
+
+    /// <summary>
+    /// Attaches property changed handlers to the filter items.
+    /// </summary>
+    private void AttachPropertyChangedHandlers()
+    {
+        if (_filterItems?.Count > 0)
+        {
+            foreach (var item in _filterItems)
+            {
+                item.PropertyChanged += OnFilterItemPropertyChanged;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Detaches property changed handlers from the filter items.
+    /// </summary>
+    private void DetachPropertyChangedHandlers()
+    {
+        if (_filterItems?.Count > 0)
+        {
+            foreach (var item in _filterItems)
+            {
+                item.PropertyChanged -= OnFilterItemPropertyChanged;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Handles the PropertyChanged event for filter items.
+    /// </summary>
+    private void OnFilterItemPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        SetSelectAllCheckBoxState();
+    }
+
+    /// <summary>
+    /// Gets a value indicating whether to apply the filter based on the control state.
+    /// </summary>
+    internal bool ShouldApplyFilter => selectAllCheckBox.IsChecked is false || !string.IsNullOrEmpty(searchBox.Text);
+
+    /// <summary>
+    /// Gets or sets the filter items for the control.
+    /// </summary>
+    internal ICollection<TableViewFilterItem>? FilterItems
+    {
+        get => _filterItems;
+        set
+        {
+            if (_filterItems == value) return;
+
+            DetachPropertyChangedHandlers();
+            _filterItems = value;
+            filterItemsList.ItemsSource = _filterItems;
+            AttachPropertyChangedHandlers();
+            SetSelectAllCheckBoxState();
+        }
+    }
+
+    /// <summary>
+    /// Gets or sets the column header associated with the filter items control.
+    /// </summary>
+    public TableViewColumnHeader? ColumnHeader { get; internal set; }
+
+    /// <summary>
+    /// Gets or sets the TableView associated with the filter items control.
+    /// </summary>
+    public TableView? TableView { get; internal set; }
+}
diff --git a/src/TableViewColumnHeader.OptionsFlyoutViewModel.cs b/src/TableViewColumnHeader.OptionsFlyoutViewModel.cs
deleted file mode 100644
index 77309c25..00000000
--- a/src/TableViewColumnHeader.OptionsFlyoutViewModel.cs
+++ /dev/null
@@ -1,200 +0,0 @@
-using Microsoft.UI.Xaml.Input;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using SD = WinUI.TableView.SortDirection;
-
-namespace WinUI.TableView;
-
-public partial class TableViewColumnHeader
-{
-    /// <summary>
-    /// ViewModel for the options flyout in the TableViewColumnHeader.
-    /// </summary>
-    internal partial class OptionsFlyoutViewModel : INotifyPropertyChanged
-    {
-        public event PropertyChangedEventHandler? PropertyChanged;
-        private IList<TableViewFilterItem> _filterItems = [];
-        private bool _canSetState = true;
-
-        /// <summary>
-        /// Initializes a new instance of the OptionsFlyoutViewModel class.
-        /// </summary>
-        /// <param name="tableView">The TableView associated with the ViewModel.</param>
-        /// <param name="columnHeader">The TableViewColumnHeader associated with the ViewModel.</param>
-        public OptionsFlyoutViewModel(TableView tableView, TableViewColumnHeader columnHeader)
-        {
-            TableView = tableView;
-            ColumnHeader = columnHeader;
-            InitializeCommands();
-        }
-
-        /// <summary>
-        /// Initializes the commands for the ViewModel.
-        /// </summary>
-        private void InitializeCommands()
-        {
-            SortAscendingCommand.ExecuteRequested += delegate { ColumnHeader.DoSort(SD.Ascending); };
-            SortAscendingCommand.CanExecuteRequested += (_, e) => e.CanExecute = ColumnHeader.CanSort && ColumnHeader.Column?.SortDirection != SD.Ascending;
-
-            SortDescendingCommand.ExecuteRequested += delegate { ColumnHeader.DoSort(SD.Descending); };
-            SortDescendingCommand.CanExecuteRequested += (_, e) => e.CanExecute = ColumnHeader.CanSort && ColumnHeader.Column?.SortDirection != SD.Descending;
-
-            ClearSortingCommand.ExecuteRequested += delegate { ColumnHeader.ClearSortingWithEvent(); };
-            ClearSortingCommand.CanExecuteRequested += (_, e) => e.CanExecute = ColumnHeader.Column?.SortDirection is not null;
-
-            ClearFilterCommand.ExecuteRequested += delegate { ColumnHeader.ClearFilter(); };
-            ClearFilterCommand.CanExecuteRequested += (_, e) => e.CanExecute = ColumnHeader.Column?.IsFiltered is true;
-
-            OkCommand.ExecuteRequested += delegate
-            {
-                ColumnHeader.HideFlyout();
-                ColumnHeader.ApplyFilter();
-            };
-
-            CancelCommand.ExecuteRequested += delegate { ColumnHeader.HideFlyout(); };
-        }
-
-        /// <summary>
-        /// Attaches property changed handlers to the filter items.
-        /// </summary>
-        private void AttachPropertyChangedHandlers()
-        {
-            if (_filterItems?.Count > 0)
-            {
-                foreach (var item in _filterItems)
-                {
-                    item.PropertyChanged += OnFilterItemPropertyChanged;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Detaches property changed handlers from the filter items.
-        /// </summary>
-        private void DetachPropertyChangedHandlers()
-        {
-            if (_filterItems?.Count > 0)
-            {
-                foreach (var item in _filterItems)
-                {
-                    item.PropertyChanged -= OnFilterItemPropertyChanged;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Handles the PropertyChanged event for filter items.
-        /// </summary>
-        private void OnFilterItemPropertyChanged(object? sender, PropertyChangedEventArgs e)
-        {
-            SetSelectAllCheckBoxState();
-        }
-
-        /// <summary>
-        /// Gets the TableView associated with the ViewModel.
-        /// </summary>
-        public TableView TableView { get; }
-
-        /// <summary>
-        /// Gets the TableViewColumnHeader associated with the ViewModel.
-        /// </summary>
-        public TableViewColumnHeader ColumnHeader { get; }
-
-        /// <summary>
-        /// Gets or sets the filter items.
-        /// </summary>
-        public IList<TableViewFilterItem> FilterItems
-        {
-            get => _filterItems;
-            set
-            {
-                if (_filterItems == value) return;
-
-                DetachPropertyChangedHandlers();
-                _filterItems = value;
-                AttachPropertyChangedHandlers();                
-                SetSelectAllCheckBoxState();
-                OnPropertyChanged();
-            }
-        }
-
-        /// <summary>
-        /// Gets the selected values for the filter.
-        /// </summary>
-        public ICollection<object?> SelectedValues { get; set; } = [];
-
-        /// <summary>
-        /// Sets the state of the select all checkbox.
-        /// </summary>
-        internal void SetSelectAllCheckBoxState()
-        {
-            if (ColumnHeader._selectAllCheckBox is null || !_canSetState)
-            {
-                return;
-            }
-
-            ColumnHeader._selectAllCheckBox.IsChecked = _filterItems.All(x => x.IsSelected)
-                                                        ? true
-                                                        : _filterItems.All(x => !x.IsSelected)
-                                                        ? false
-                                                        : null;
-        }
-
-        /// <summary>
-        /// Sets the state of the filter items.
-        /// </summary>
-        /// <param name="isSelected">The state to set.</param>
-        internal void SetFilterItemsState(bool isSelected)
-        {
-            _canSetState = false;
-
-            foreach (var item in FilterItems)
-            {
-                item.IsSelected = isSelected;
-            }
-
-            _canSetState = true;
-        }
-
-        /// <summary>
-        /// Raises the PropertyChanged event.
-        /// </summary>
-        /// <param name="propertyName">The name of the property that changed.</param>
-        private void OnPropertyChanged([CallerMemberName] string? propertyName = default)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-
-        /// <summary>
-        /// Gets the command to sort in ascending order.
-        /// </summary>
-        public StandardUICommand SortAscendingCommand { get; } = new() { Label = TableViewLocalizedStrings.SortAscending };
-
-        /// <summary>
-        /// Gets the command to sort in descending order.
-        /// </summary>
-        public StandardUICommand SortDescendingCommand { get; } = new() { Label = TableViewLocalizedStrings.SortDescending };
-
-        /// <summary>
-        /// Gets the command to clear sorting.
-        /// </summary>
-        public StandardUICommand ClearSortingCommand { get; } = new() { Label = TableViewLocalizedStrings.ClearSorting };
-
-        /// <summary>
-        /// Gets the command to clear the filter.
-        /// </summary>
-        public StandardUICommand ClearFilterCommand { get; } = new() { Label = TableViewLocalizedStrings.ClearFilter };
-
-        /// <summary>
-        /// Gets the command to confirm the filter.
-        /// </summary>
-        public StandardUICommand OkCommand { get; } = new() { Label = TableViewLocalizedStrings.Ok };
-
-        /// <summary>
-        /// Gets the command to cancel the filter.
-        /// </summary>
-        public StandardUICommand CancelCommand { get; } = new() { Label = TableViewLocalizedStrings.Cancel };
-    }
-}
\ No newline at end of file
diff --git a/src/TableViewColumnHeader.cs b/src/TableViewColumnHeader.cs
index 95b1cd01..443694ce 100644
--- a/src/TableViewColumnHeader.cs
+++ b/src/TableViewColumnHeader.cs
@@ -13,6 +13,7 @@
 using Windows.System;
 using Windows.UI.Core;
 using WinUI.TableView.Collections;
+using WinUI.TableView.Controls;
 using WinUI.TableView.Extensions;
 using SD = WinUI.TableView.SortDirection;
 
@@ -39,16 +40,13 @@ public partial class TableViewColumnHeader : ContentControl
     private MenuFlyout? _optionsFlyout;
     private ContentPresenter? _contentPresenter;
     private Rectangle? _v_gridLine;
-    private CheckBox? _selectAllCheckBox;
-    private OptionsFlyoutViewModel _optionsFlyoutViewModel = default!;
     private bool _resizeStarted;
     private double _resizeStartingWidth;
     private bool _resizePreviousStarted;
-    private TextBox? _searchBox;
     private double _reorderStartingPosition;
     private bool _reorderStarted;
     private RenderTargetBitmap? _dragVisuals;
-    private ListView? _filterItemsList;
+    private TableViewFilterItemsControl? _filterItemsControl;
 
     /// <summary>
     /// Initializes a new instance of the TableViewColumnHeader class.
@@ -157,21 +155,23 @@ private void ClearFilter()
     /// </summary>
     private void ApplyFilter()
     {
-        if (_selectAllCheckBox?.IsChecked is true && string.IsNullOrEmpty(_searchBox?.Text))
+        var shouldApplyFilter = _filterItemsControl?.ShouldApplyFilter ?? false;
+
+        if (!shouldApplyFilter && (Column?.IsFiltered ?? false))
         {
             ClearFilter();
         }
-        else if (_tableView is not null)
+        else if (shouldApplyFilter && _tableView is not null)
         {
-            _optionsFlyoutViewModel.SelectedValues = GetSelectedValues();
-            _tableView.FilterHandler.SelectedValues[Column!] = _optionsFlyoutViewModel.SelectedValues;
+            _tableView.FilterHandler.SelectedValues[Column!] = GetSelectedValues();
             _tableView.FilterHandler?.ApplyFilter(Column!);
         }
     }
 
     private ICollection<object?> GetSelectedValues()
     {
-        var selectedValues = _optionsFlyoutViewModel.FilterItems.Where(x => x.IsSelected).Select(x => x.Value);
+        var filterItems = _filterItemsControl?.FilterItems ?? [];
+        var selectedValues = filterItems.Where(x => x.IsSelected).Select(x => x.Value);
         var firstItem = selectedValues.FirstOrDefault(x => x is not null);
         var firstItemType = firstItem?.GetType();
 
@@ -245,114 +245,30 @@ protected override void OnApplyTemplate()
         _optionsFlyout.Opening += OnOptionsFlyoutOpening;
         _optionsFlyout.Closed += OnOptionsFlyoutClosed;
         _optionsButton.Tapped += OnOptionsButtonTaped;
-        _optionsButton.DataContext = _optionsFlyoutViewModel = new OptionsFlyoutViewModel(_tableView, this);
 
-        if (_optionsFlyout.Items.FirstOrDefault(x => x.Name == "ItemsCheckFlyoutItem") is { } menuItem)
+        if (GetTemplateChild("FilterItemsMenuItem") is MenuFlyoutItem filterItemsMenuItem)
         {
-            menuItem.Loaded += OnItemsCheckFlyoutItemLoaded;
+            filterItemsMenuItem.ApplyTemplate();
+            _filterItemsControl = filterItemsMenuItem.FindDescendant<TableViewFilterItemsControl>();
+
+            if (_filterItemsControl is not null)
+            {
+                _filterItemsControl.TableView = _tableView;
+                _filterItemsControl.ColumnHeader = this;
+            }
         }
 
+        SetOptionCommands();
         SetFilterButtonVisibility();
         EnsureGridLines();
     }
 
-    /// <summary>
-    /// Handles the Loaded event for the items check flyout item.
-    /// </summary>
-    private void OnItemsCheckFlyoutItemLoaded(object sender, RoutedEventArgs e)
-    {
-        if (sender is not MenuFlyoutItem menuItem) return;
-
-        menuItem.Loaded -= OnItemsCheckFlyoutItemLoaded;
-
-        if (menuItem?.FindDescendant<CheckBox>(x => x.Name == "SelectAllCheckBox") is { } checkBox)
-        {
-            _selectAllCheckBox = checkBox;
-            _selectAllCheckBox.Content = TableViewLocalizedStrings.SelectAllParenthesized;
-            _selectAllCheckBox.Checked += OnSelectAllCheckBoxChecked;
-            _selectAllCheckBox.Unchecked += OnSelectAllCheckBoxUnchecked;
-            _optionsFlyoutViewModel.SetSelectAllCheckBoxState();
-        }
-
-        if (menuItem?.FindDescendant<TextBox>(x => x.Name == "SearchBox") is { } searchBox)
-        {
-            _searchBox = searchBox;
-            _searchBox.PlaceholderText = TableViewLocalizedStrings.SearchBoxPlaceholder;
-            _searchBox.TextChanged += OnSearchBoxTextChanged;
-#if WINDOWS
-            _searchBox.PreviewKeyDown += OnSearchBoxKeyDown;
-#else
-            _searchBox.KeyDown += OnSearchBoxKeyDown;
-#endif
-            // Handle Space key to prevent MenuFlyoutItem performing click action.
-            menuItem.PreviewKeyUp += static (_, e) => e.Handled = e.Key is VirtualKey.Space;
-        }
-
-        _filterItemsList = menuItem?.FindDescendant<ListView>(x => x.Name is "FilterItemsList");
-    }
-
-    /// <summary>
-    /// Handles the TextChanged event for the search box.
-    /// </summary>
-    private void OnSearchBoxTextChanged(object sender, TextChangedEventArgs e)
-    {
-        if (_tableView?.FilterHandler is not null)
-        {
-            _optionsFlyoutViewModel.FilterItems = _tableView.FilterHandler.GetFilterItems(Column!, _searchBox!.Text);
-        }
-    }
-
-    /// <summary>
-    /// Handles the KeyDown event for the search box.
-    /// </summary>
-    private void OnSearchBoxKeyDown(object sender, KeyRoutedEventArgs e)
-    {
-        if (e.Key == VirtualKey.Enter && _searchBox?.Text.Length > 0)
-        {
-            _optionsFlyoutViewModel.OkCommand.Execute(null);
-
-            e.Handled = true;
-        }
-    }
-
-    /// <summary>
-    /// Handles the Checked event for the select all checkbox.
-    /// </summary>
-    private void OnSelectAllCheckBoxChecked(object sender, RoutedEventArgs e)
-    {
-        var checkBox = (CheckBox)sender;
-        _optionsFlyoutViewModel.SetFilterItemsState(checkBox.IsChecked == true);
-    }
-
-    /// <summary>
-    /// Handles the Unchecked event for the select all checkbox.
-    /// </summary>
-    private void OnSelectAllCheckBoxUnchecked(object sender, RoutedEventArgs e)
-    {
-        var checkBox = (CheckBox)sender;
-        _optionsFlyoutViewModel.SetFilterItemsState(checkBox.IsChecked == true);
-    }
-
     /// <summary>
     /// Handles the Opening event for the options flyout.
     /// </summary>
     private async void OnOptionsFlyoutOpening(object? sender, object e)
     {
-        if (_tableView?.FilterHandler is not null)
-        {
-            _optionsFlyoutViewModel.FilterItems = _tableView.FilterHandler.GetFilterItems(Column!, null);
-        }
-
-        if (_searchBox is not null)
-        {
-            await Task.Delay(100);
-            await FocusManager.TryFocusAsync(_searchBox, FocusState.Programmatic);
-        }
-
-        if (_filterItemsList is not null && _optionsFlyoutViewModel.FilterItems.Count > 0)
-        {
-            _filterItemsList.ScrollIntoView(_optionsFlyoutViewModel.FilterItems[0]);
-        }
+        _filterItemsControl?.Initialize();
     }
 
     /// <summary>
@@ -360,10 +276,7 @@ private async void OnOptionsFlyoutOpening(object? sender, object e)
     /// </summary>
     private void OnOptionsFlyoutClosed(object? sender, object e)
     {
-        if (_searchBox is not null)
-        {
-            _searchBox.Text = string.Empty;
-        }
+        _filterItemsControl?.ClearSearchBox();
     }
 
     /// <summary>
diff --git a/src/TableViewFilterItem.cs b/src/TableViewFilterItem.cs
index 2f8ccdd6..e869fb8a 100644
--- a/src/TableViewFilterItem.cs
+++ b/src/TableViewFilterItem.cs
@@ -18,11 +18,13 @@ public partial class TableViewFilterItem : INotifyPropertyChanged
     /// <param name="isSelected">Indicates whether the filter item is selected.</param>
     /// <param name="value">The value of the filter item.</param>
     /// <param name="count">The count of occurrences for the filter item.</param>
-    public TableViewFilterItem(bool isSelected, object? value, int count = 1)
+    /// <param name="showCount">Indicates whether to show the count of occurrences.</param>
+    public TableViewFilterItem(bool isSelected, object? value, int count = 1, bool showCount = false)
     {
         IsSelected = isSelected;
         Value = value;
         Count = count;
+        ShowCount = showCount;
     }
 
     /// <summary>
@@ -43,14 +45,15 @@ public bool IsSelected
     /// </summary>
     public object? Value { get; }
 
+    public string ValueText => Value?.ToString() ?? TableViewLocalizedStrings.BlankFilterValue;
+
     /// <summary>
     /// Gets or sets the count of occurrences for the filter item.
     /// </summary>
     public int Count { get; set; }
 
-    /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Value is null ? TableViewLocalizedStrings.BlankFilterValue : $"{Value}";
-    }
+    /// <summary>
+    /// Gets a value indicating whether to show the count for the filter item.
+    /// </summary>
+    public bool ShowCount { get; }
 }
diff --git a/src/Themes/TableViewColumnHeader.xaml b/src/Themes/TableViewColumnHeader.xaml
index 24dfccdf..3f45b4ef 100644
--- a/src/Themes/TableViewColumnHeader.xaml
+++ b/src/Themes/TableViewColumnHeader.xaml
@@ -1,18 +1,12 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                     xmlns:local="using:WinUI.TableView"
-                    xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:not_win="http://uno.ui/not_win"
-                    xmlns:converters="using:WinUI.TableView.Converters"
-                    mc:Ignorable="not_win">
+                    xmlns:controls="using:WinUI.TableView.Controls">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="ms-appx:///WinUI.TableView/Themes/Resources.xaml" />
     </ResourceDictionary.MergedDictionaries>
-
-    <converters:BoolToVisibilityConverter x:Key="BoolToVisibility" />
-
+    
     <Style x:Key="DefaultTableViewColumnHeaderStyle"
            TargetType="local:TableViewColumnHeader">
         <Setter Property="FontWeight"
@@ -151,73 +145,10 @@
                                             <MenuFlyoutItem x:Name="ClearSortingMenuItem" />
                                             <MenuFlyoutSeparator />
                                             <MenuFlyoutItem x:Name="ClearFilterMenuItem" />                                            
-                                            <MenuFlyoutItem x:Name="ItemsCheckFlyoutItem">
+                                            <MenuFlyoutItem x:Name="FilterItemsMenuItem">
                                                 <MenuFlyoutItem.Template>
                                                     <ControlTemplate TargetType="MenuFlyoutItem">
-                                                        <Grid Margin="8,4"
-                                                              Width="250"
-                                                              Height="300">
-                                                            <Grid.RowDefinitions>
-                                                                <RowDefinition Height="Auto" />
-                                                                <RowDefinition Height="Auto" />
-                                                                <RowDefinition Height="*" />
-                                                            </Grid.RowDefinitions>
-                                                            <TextBox x:Name="SearchBox" />
-                                                            <Border Grid.Row="1"
-                                                                    BorderThickness="0,0,0,1"
-                                                                    BorderBrush="{ThemeResource MenuFlyoutSeparatorBackground}">
-                                                                <CheckBox x:Name="SelectAllCheckBox"
-                                                                          Margin="12,8,12,1" />
-                                                            </Border>
-                                                            <ListView x:Name="FilterItemsList"
-                                                                      Grid.Row="2"
-                                                                      SelectionMode="None"
-                                                                      not_win:Margin="12,0,0,0"
-                                                                      ItemsSource="{Binding FilterItems}">
-                                                                <ListView.ItemContainerStyle>
-                                                                    <Style TargetType="ListViewItem"
-                                                                           BasedOn="{StaticResource DefaultListViewItemStyle}">
-                                                                        <Setter Property="Padding"
-                                                                                Value="12,0" />
-                                                                        <Setter Property="Margin"
-                                                                                Value="0" />
-                                                                        <Setter Property="MinHeight"
-                                                                                Value="36" />
-                                                                        <Setter Property="Height"
-                                                                                Value="36" />
-                                                                        <Setter Property="HorizontalAlignment"
-                                                                                Value="Stretch" />
-                                                                        <Setter Property="HorizontalContentAlignment"
-                                                                                Value="Stretch" />
-                                                                    </Style>
-                                                                </ListView.ItemContainerStyle>
-                                                                <ListView.ItemTemplate>
-                                                                    <DataTemplate>
-                                                                        <CheckBox IsChecked="{Binding IsSelected, Mode=TwoWay}"
-                                                                                  HorizontalAlignment="Stretch"
-                                                                                  HorizontalContentAlignment="Stretch">
-                                                                            <Grid>
-                                                                                <Grid.ColumnDefinitions>
-                                                                                    <ColumnDefinition Width="*" />
-                                                                                    <ColumnDefinition Width="Auto" />
-                                                                                </Grid.ColumnDefinitions>
-
-                                                                                <TextBlock Text="{Binding}"
-                                                                                           TextWrapping="NoWrap" />
-
-                                                                                <StackPanel Grid.Column="1"
-                                                                                            Orientation="Horizontal"
-                                                                                            Visibility="{Binding DataContext.TableView.ShowFilterItemsCount, ElementName=FilterItemsList, Converter={StaticResource BoolToVisibility}}">
-                                                                                    <TextBlock Text="(" />
-                                                                                    <TextBlock Text="{Binding Count}" />
-                                                                                    <TextBlock Text=")" />
-                                                                                </StackPanel>
-                                                                            </Grid>
-                                                                        </CheckBox>
-                                                                    </DataTemplate>
-                                                                </ListView.ItemTemplate>
-                                                            </ListView>
-                                                        </Grid>
+                                                        <controls:TableViewFilterItemsControl />
                                                     </ControlTemplate>
                                                 </MenuFlyoutItem.Template>
                                             </MenuFlyoutItem>

From b5432e3638f7695bb8200898879ad91903cb7b79 Mon Sep 17 00:00:00 2001
From: Waheed Ahmad <waheed.ahmad92@outlook.com>
Date: Fri, 6 Feb 2026 22:05:52 +0500
Subject: [PATCH 05/17] rename SetOptionMenuCommands to SetOptionCommands

---
 src/ColumnFilterHandler.cs               | 4 ++--
 src/TableViewHeaderRow.OptionComamnds.cs | 4 ++--
 src/TableViewHeaderRow.cs                | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ColumnFilterHandler.cs b/src/ColumnFilterHandler.cs
index 9c6e94cd..8a1b67f3 100644
--- a/src/ColumnFilterHandler.cs
+++ b/src/ColumnFilterHandler.cs
@@ -69,13 +69,13 @@ private IEnumerable<TableViewFilterItem> GetFilterItemsWithCount(TableViewColumn
             else filterValues.Add(value, 1);
         }
 
-        IEnumerable<TableViewFilterItem> nullFilterItem = nullCount > 0 ? [new TableViewFilterItem(isNullItemSelected, null, nullCount)] : [];
+        IEnumerable<TableViewFilterItem> nullFilterItem = nullCount > 0 ? [new TableViewFilterItem(isNullItemSelected, null, nullCount, true)] : [];
 
         return [.. nullFilterItem,.. filterValues.Select(x =>
         {
             var isSelected = !column.IsFiltered || !string.IsNullOrEmpty(searchText) ||
                              (column.IsFiltered && SelectedValues[column].Contains(x.Key));
-            return new TableViewFilterItem(isSelected, x.Key, x.Value);
+            return new TableViewFilterItem(isSelected, x.Key, x.Value, true);
         }) .OrderByDescending(x=>x.Count)];
     }
 
diff --git a/src/TableViewHeaderRow.OptionComamnds.cs b/src/TableViewHeaderRow.OptionComamnds.cs
index 76e0c9f6..81382d4a 100644
--- a/src/TableViewHeaderRow.OptionComamnds.cs
+++ b/src/TableViewHeaderRow.OptionComamnds.cs
@@ -38,7 +38,7 @@ internal void SetExportOptionsVisibility()
     /// <summary>
     /// Sets commands to option menu items.
     /// </summary>
-    private void SetOptionMenuCommands()
+    private void SetOptionCommands()
     {
         InitializeCommands();
 
@@ -67,7 +67,7 @@ private void SetOptionMenuCommands()
     }
 
     /// <summary>
-    /// Initializes the commands for the ViewModel.
+    /// Initializes the commands.
     /// </summary>
     private void InitializeCommands()
     {
diff --git a/src/TableViewHeaderRow.cs b/src/TableViewHeaderRow.cs
index 0a6bb040..a94316f6 100644
--- a/src/TableViewHeaderRow.cs
+++ b/src/TableViewHeaderRow.cs
@@ -92,7 +92,7 @@ protected override void OnApplyTemplate()
             Path = new PropertyPath(nameof(TableView.CellsHorizontalOffset))
         });
 
-        SetOptionMenuCommands();
+        SetOptionCommands();
         SetExportOptionsVisibility();
         SetCornerButtonState();
         SetHeadersVisibility();

From adcac052054ab99250bd56d129c69117574a4db9 Mon Sep 17 00:00:00 2001
From: Waheed Ahmad <waheed.ahmad92@outlook.com>
Date: Fri, 3 Apr 2026 19:04:42 +0500
Subject: [PATCH 06/17] simplify drag indicator handling by removing
 DataContext binding

---
 src/TableViewHeaderRow.cs          | 25 ++++++++++++-------------
 src/Themes/TableViewHeaderRow.xaml |  4 +---
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/TableViewHeaderRow.cs b/src/TableViewHeaderRow.cs
index a94316f6..5c304c15 100644
--- a/src/TableViewHeaderRow.cs
+++ b/src/TableViewHeaderRow.cs
@@ -38,8 +38,10 @@ public partial class TableViewHeaderRow : Control
     private StackPanel? _scrollableHeadersPanel;
     private Border? _columnDropIndicator;
     private TranslateTransform? _columnDropIndicatorTransform;
+    private Image? _dragHeaderImage;
     private bool _calculatingHeaderWidths;
     private DispatcherTimer? _timer;
+    private int _dropColumnIndex;
     private readonly Dictionary<DependencyProperty, long> _callbackTokens = [];
 
     /// <summary>
@@ -64,6 +66,7 @@ protected override void OnApplyTemplate()
         _scrollableHeadersPanel = GetTemplateChild("ScrollableHeadersPanel") as StackPanel;
         _columnDropIndicator = GetTemplateChild("ColumnDropIndicator") as Border;
         _columnDropIndicatorTransform = GetTemplateChild("ColumnDropIndicatorTransform") as TranslateTransform;
+        _dragHeaderImage = GetTemplateChild("DragHeaderImage") as Image;
 
         if (TableView is null)
         {
@@ -521,33 +524,36 @@ internal void ShowColumnDropIndicator(double position, RenderTargetBitmap header
     {
         if (_columnDropIndicator is not null && FindHeader(new(position, ActualHeight / 2)) is { Column: { } dropColumn } dropHeader)
         {
-            var dropColumnIndex = TableView?.Columns.VisibleColumns.IndexOf(dropColumn) ?? 0;
+            _dropColumnIndex = TableView?.Columns.VisibleColumns.IndexOf(dropColumn) ?? 0;
             var transform = dropHeader.TransformToVisual(this);
             var dropHeaderX = transform.TransformPoint(new Point(0, 0)).X;
             var midPoint = dropHeaderX + (dropHeader.ActualWidth / 2);
             var x = dropHeaderX;
             x += midPoint < position ? dropHeader.ActualWidth : 0d;
             x -= _columnDropIndicator.ActualWidth / 2;
-            dropColumnIndex += midPoint > position ? -1 : 0;
-
-            _columnDropIndicator.DataContext = new DragIndicatorData(dropColumnIndex, headerVisuals);
+            _dropColumnIndex += midPoint > position ? -1 : 0;
             _columnDropIndicator.Visibility = Visibility.Visible;
 
             if (_columnDropIndicatorTransform is not null)
             {
                 _columnDropIndicatorTransform.X = x;
             }
+
+            if (_dragHeaderImage is not null)
+            {
+                _dragHeaderImage.Source = headerVisuals;
+            }
         }
     }
 
     internal void ColumnDropCompleted(TableViewColumn column)
     {
-        if (_columnDropIndicator is { DataContext: DragIndicatorData data } && TableView is not null)
+        if (TableView is not null && _columnDropIndicator is not null)
         {
             _columnDropIndicator.Visibility = Visibility.Collapsed;
 
             var sourceIndex = TableView.Columns.VisibleColumns.IndexOf(column);
-            var dropIndex = sourceIndex > data.DropIndex ? data.DropIndex + 1 : data.DropIndex;
+            var dropIndex = sourceIndex > _dropColumnIndex ? _dropColumnIndex + 1 : _dropColumnIndex;
             dropIndex = Math.Clamp(dropIndex, 0, TableView.Columns.VisibleColumns.Count - 1);
 
             var reorderingArgs = new TableViewColumnReorderingEventArgs(column, dropIndex);
@@ -706,10 +712,3 @@ public TableView? TableView
     /// </summary>
     public static readonly DependencyProperty TableViewProperty = DependencyProperty.Register(nameof(TableView), typeof(TableView), typeof(TableViewHeaderRow), new PropertyMetadata(null, OnTableViewChanged));
 }
-
-/// <summary>
-/// Provides data for the drag indicator during column reordering.
-/// </summary>
-/// <param name="DropIndex">The index where the column is dropped.</param>
-/// <param name="Visuals">The visuals associated with the drag indicator.</param>
-file record struct DragIndicatorData(int DropIndex, RenderTargetBitmap Visuals);
diff --git a/src/Themes/TableViewHeaderRow.xaml b/src/Themes/TableViewHeaderRow.xaml
index 577a25d0..1456a69d 100644
--- a/src/Themes/TableViewHeaderRow.xaml
+++ b/src/Themes/TableViewHeaderRow.xaml
@@ -197,7 +197,6 @@
                                 Translation="0, 0, 32"
                                 BorderThickness="1"
                                 RenderTransformOrigin="0.5,0.5"
-                                DataContext="{x:Null}"
                                 BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
                                 Background="{ThemeResource CardBackgroundFillColorDefaultBrush}">
                             <Border.Shadow>
@@ -218,8 +217,7 @@
                                           VerticalAlignment="Bottom" 
                                           Foreground="{ThemeResource TextFillColorTertiaryBrush}"/>
                                 <Image x:Name="DragHeaderImage"
-                                       Stretch="None"
-                                       Source="{Binding Visuals}"/>
+                                       Stretch="None" />
                             </Grid>
                         </Border>
                         <Rectangle x:Name="HorizontalGridLine"

From 04980fb36db1482374255761a3555c835e27ff90 Mon Sep 17 00:00:00 2001
From: Waheed Ahmad <waheed.ahmad92@outlook.com>
Date: Fri, 3 Apr 2026 19:17:27 +0500
Subject: [PATCH 07/17] add comments on ValueText property

---
 src/TableViewFilterItem.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/TableViewFilterItem.cs b/src/TableViewFilterItem.cs
index e869fb8a..76749ede 100644
--- a/src/TableViewFilterItem.cs
+++ b/src/TableViewFilterItem.cs
@@ -45,6 +45,9 @@ public bool IsSelected
     /// </summary>
     public object? Value { get; }
 
+    /// <summary>
+    /// Gets the text representation of the filter item's value, or a localized string for blank values if the value is null.
+    /// </summary>
     public string ValueText => Value?.ToString() ?? TableViewLocalizedStrings.BlankFilterValue;
 
     /// <summary>

From d70078f106b7be1a8dcefe35c21fed1a2e422222 Mon Sep 17 00:00:00 2001
From: Waheed Ahmad <waheed.ahmad92@outlook.com>
Date: Fri, 17 Apr 2026 17:00:18 +0500
Subject: [PATCH 08/17] Add Aot test project

---
 WinUI.TableView.slnx                          |   4 +
 samples/AotTestApp/AotTestApp.csproj          |  76 ++++++
 samples/AotTestApp/App.xaml                   |  16 ++
 samples/AotTestApp/App.xaml.cs                |  48 ++++
 .../Assets/LockScreenLogo.scale-200.png       | Bin 0 -> 432 bytes
 .../Assets/SplashScreen.scale-200.png         | Bin 0 -> 5372 bytes
 .../Assets/Square150x150Logo.scale-200.png    | Bin 0 -> 1755 bytes
 .../Assets/Square44x44Logo.scale-200.png      | Bin 0 -> 637 bytes
 ...x44Logo.targetsize-24_altform-unplated.png | Bin 0 -> 283 bytes
 samples/AotTestApp/Assets/StoreLogo.png       | Bin 0 -> 456 bytes
 .../Assets/Wide310x150Logo.scale-200.png      | Bin 0 -> 2097 bytes
 samples/AotTestApp/BlankPage1.xaml            |  56 +++++
 samples/AotTestApp/BlankPage1.xaml.cs         |  36 +++
 samples/AotTestApp/DataFaker.cs               | 234 ++++++++++++++++++
 samples/AotTestApp/ExampleModel.cs            |  73 ++++++
 samples/AotTestApp/MainViewModel.cs           |  72 ++++++
 samples/AotTestApp/MainWindow.xaml            |  19 ++
 samples/AotTestApp/MainWindow.xaml.cs         |  12 +
 samples/AotTestApp/Package.appxmanifest       |  51 ++++
 .../AotTestApp/Properties/launchSettings.json |  10 +
 samples/AotTestApp/app.manifest               |  19 ++
 21 files changed, 726 insertions(+)
 create mode 100644 samples/AotTestApp/AotTestApp.csproj
 create mode 100644 samples/AotTestApp/App.xaml
 create mode 100644 samples/AotTestApp/App.xaml.cs
 create mode 100644 samples/AotTestApp/Assets/LockScreenLogo.scale-200.png
 create mode 100644 samples/AotTestApp/Assets/SplashScreen.scale-200.png
 create mode 100644 samples/AotTestApp/Assets/Square150x150Logo.scale-200.png
 create mode 100644 samples/AotTestApp/Assets/Square44x44Logo.scale-200.png
 create mode 100644 samples/AotTestApp/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
 create mode 100644 samples/AotTestApp/Assets/StoreLogo.png
 create mode 100644 samples/AotTestApp/Assets/Wide310x150Logo.scale-200.png
 create mode 100644 samples/AotTestApp/BlankPage1.xaml
 create mode 100644 samples/AotTestApp/BlankPage1.xaml.cs
 create mode 100644 samples/AotTestApp/DataFaker.cs
 create mode 100644 samples/AotTestApp/ExampleModel.cs
 create mode 100644 samples/AotTestApp/MainViewModel.cs
 create mode 100644 samples/AotTestApp/MainWindow.xaml
 create mode 100644 samples/AotTestApp/MainWindow.xaml.cs
 create mode 100644 samples/AotTestApp/Package.appxmanifest
 create mode 100644 samples/AotTestApp/Properties/launchSettings.json
 create mode 100644 samples/AotTestApp/app.manifest

diff --git a/WinUI.TableView.slnx b/WinUI.TableView.slnx
index 64845ab8..f115bfbd 100644
--- a/WinUI.TableView.slnx
+++ b/WinUI.TableView.slnx
@@ -1,5 +1,9 @@
 <Solution>
   <Folder Name="/samples/">
+    <Project Path="samples/AotTestApp/AotTestApp.csproj">
+      <Platform Project="x64" />
+      <Deploy />
+    </Project>
     <Project Path="samples/WinUI.TableView.SampleApp.Uno/WinUI.TableView.SampleApp.Uno.csproj" />
     <Project Path="samples/WinUI.TableView.SampleApp/WinUI.TableView.SampleApp.csproj">
       <Platform Project="x64" />
diff --git a/samples/AotTestApp/AotTestApp.csproj b/samples/AotTestApp/AotTestApp.csproj
new file mode 100644
index 00000000..78db99e7
--- /dev/null
+++ b/samples/AotTestApp/AotTestApp.csproj
@@ -0,0 +1,76 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net10.0-windows10.0.19041.0</TargetFramework>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <RootNamespace>AotTestApp</RootNamespace>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <Platforms>x86;x64;ARM64</Platforms>
+    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+    <PublishProfile>win-$(Platform).pubxml</PublishProfile>
+    <UseWinUI>true</UseWinUI>
+    <WinUISDKReferences>false</WinUISDKReferences>
+    <EnableMsixTooling>true</EnableMsixTooling>
+    <Nullable>enable</Nullable>
+    <PublishAot>true</PublishAot>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CsWinRTAotWarningLevel>2</CsWinRTAotWarningLevel>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="Assets\SplashScreen.scale-200.png" />
+    <Content Include="Assets\LockScreenLogo.scale-200.png" />
+    <Content Include="Assets\Square150x150Logo.scale-200.png" />
+    <Content Include="Assets\Square44x44Logo.scale-200.png" />
+    <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="Assets\StoreLogo.png" />
+    <Content Include="Assets\Wide310x150Logo.scale-200.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Manifest Include="$(ApplicationManifest)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AdditionalFiles Include="**\*.xaml" Exclude="bin\**\*;obj\**\*" />
+  </ItemGroup>
+
+  <!--
+    Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
+    Tools extension to be activated for this project even if the Windows App SDK Nuget
+    package has not yet been restored.
+  -->
+  <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
+    <ProjectCapability Include="Msix" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Mvvm" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WinUI.TableView.csproj" />
+    <ProjectReference Include="..\..\generators\WinUI.TableView.SourceGenerators.csproj" 
+                      OutputItemType="Analyzer"
+                      ReferenceOutputAssembly="false" />
+  </ItemGroup>
+
+  <!--
+    Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution
+    Explorer "Package and Publish" context menu entry to be enabled for this project even if
+    the Windows App SDK Nuget package has not yet been restored.
+  -->
+  <PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
+    <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
+  </PropertyGroup>
+
+  <!-- Publish Properties -->
+  <PropertyGroup>
+    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
+    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
+    <PublishTrimmed Condition="'$(Configuration)' == 'Debug'">False</PublishTrimmed>
+    <PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/samples/AotTestApp/App.xaml b/samples/AotTestApp/App.xaml
new file mode 100644
index 00000000..46f6f503
--- /dev/null
+++ b/samples/AotTestApp/App.xaml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Application
+    x:Class="AotTestApp.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:AotTestApp">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+                <!-- Other merged dictionaries here -->
+            </ResourceDictionary.MergedDictionaries>
+            <!-- Other app resources here -->
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>
diff --git a/samples/AotTestApp/App.xaml.cs b/samples/AotTestApp/App.xaml.cs
new file mode 100644
index 00000000..a068abaa
--- /dev/null
+++ b/samples/AotTestApp/App.xaml.cs
@@ -0,0 +1,48 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using Microsoft.UI.Xaml.Shapes;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Activation;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace AotTestApp;
+/// <summary>
+/// Provides application-specific behavior to supplement the default Application class.
+/// </summary>
+public partial class App : Application
+{
+    private Window? _window;
+
+    /// <summary>
+    /// Initializes the singleton application object.  This is the first line of authored code
+    /// executed, and as such is the logical equivalent of main() or WinMain().
+    /// </summary>
+    public App()
+    {
+        InitializeComponent();
+    }
+
+    /// <summary>
+    /// Invoked when the application is launched.
+    /// </summary>
+    /// <param name="args">Details about the launch request and process.</param>
+    protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args)
+    {
+        _window = new MainWindow();
+        _window.Activate();
+    }
+}
diff --git a/samples/AotTestApp/Assets/LockScreenLogo.scale-200.png b/samples/AotTestApp/Assets/LockScreenLogo.scale-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..7440f0d4bf7c7e26e4e36328738c68e624ee851e
GIT binary patch
literal 432
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezr3(FqV6|IEGZ*x-#9g>~Mkr+x6^F
zy~CDX2QIMs&Gcs3RnRBoxBA!*(Mfw0KTCYuYk0Wl<A3kFdDp`#?}XI|oqqQ0*|D%p
zsa`i8jb+)Z4OKr{E6gsxDCoZ^_q1W^M*Wx^PHB+~V!M-K=X6~WvlcB>EIV>qBmPl!
zq4ukrvfADX@#p8fbLY(H47N+k`FZ(FZh?cDro7>{8mkBO3>^oaIx`3!Jl)Qq)HI!+
z(S=1{o~eT)&W^=Ea8C`-17(Jv5(nHFJ{dOjGdxLVkY_y6&S1whfuFI4MM0kF0f&cO
zPDVpV%nz;Id$>+0Ga5e9625-JcI)oq=#Pa3p^>8BB}21BUw@eN!-6@w%X+^`+Vn?!
zryu|3T>kVWNBYyBc=7Y6H#s1<v*REmr-J?Jj+807siAL#J{jLg-rpk>Ah!OI_nezW
zXTqOdkv2Az6KKBV=$yHdF^R3Fqw(TZEoNSZX>reXJ#bwX42%f|Pgg&ebxsLQ010xn
AssI20

literal 0
HcmV?d00001

diff --git a/samples/AotTestApp/Assets/SplashScreen.scale-200.png b/samples/AotTestApp/Assets/SplashScreen.scale-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..32f486a86792a5e34cd9a8261b394c49b48f86be
GIT binary patch
literal 5372
zcmd5=Z){Ul6u)iv53sCbIJKLzl(EF%0tzcEY@|pLrfgF~2Dk$KFtU+$kbYqDN5W%7
z>?DBo!@y06eh{Oux>brrNT^{MO(tkiC@nH(2}}G_1|uvcMD(0{?|W<a-a0~n*biHG
zf9L+rIlpu6dH1dP^~%NC@%r(E5N-Jq%bSFxTp~ohA|nk}Ixf~6BxLgGa?65cn<BBx
z(>^Gxo!tG~hW2Rn&7%b`-Kd_^`BCrb>XVtRKONoEw6%NswzMxk+kbocuk&}kJ#hSP
z>8uR{r%LJ?I#)aaWW;uEixz+DzyTp<n+AXFpi3#HQI?o(f|bH{g{8;N$n#--6#`ON
z8Y9NX&lrr4ess~}tsYJpA3mcgo#b_dR&Q+}f$h#K8$()bySabmT)V0fe4SsBn?`JT
zqRz#ih7J|{6av`ud?~|$-xZb;Y?)QU(in_^{=cV@zO#`s-@utQs=lVkPT#EV8Pt(=
z)rrH6b+Hq-7L!Y!vgbYjJVQ>p)MTEo&R%nEA92~g{^eXQwKV1m{xl5K<@k3FacT+Z
zrwfy=VocIptI>t%@p5a;Rt=WXVnU;2SUdr7Yk>gw_2z_ICK^23$|Cg7{3Eg5j@N*F
zetT?>30(*S_7ld-Yt&u7<vX3R{>T{(hEjjM#vPlXibjrq?;pBBx3*>_2~VFGdsH5L
zQKme_LAe<h!eZii1Fy3}l)!Aw9wE!2W(SGt2^7)bZFX=;4PF(jK}m&RONz@*d&8J(
z@Ti#Hn-$E`<z{9LBNl>bV}aOX#+rQafZtp+4jK}V!>pn1?+eUH$0%6}z(Kul9!^2z
zXi+d@jnx)RW7!j9uFEdv5N&1sCW#Z6Ej5Y7<kmvx;UKV>c;o28Q7i%U0(2v5J>o9P
zl$#C8&9r)nL;?J65^GIeSOHYr3B7}}R~}@2Tx_xo5<y?a$o$OKo{{+tbGWrUXN#$;
zSWI6_TQOb|VI7K0g?BlOxm<Xc1J+m>*YdU#g1bO}95cq69J!efdlE+x<zPjYI5xf;
z4<bjLgW^$k_B;!UVem9<T^K7uBVPzrt<OycX30S>j1qG#ZUqh~1Sn#dBsZfDvcupM
zXOFoyJ0$s+RHQKpzr#T>c&EUbq)lGvZDxuI!9unMI=#;ob2&gT)WqOjt6<h5H@jmL
zN!k>^X`_N21r`&eh6h0xpT!n6Z9rvE&+bF<pl_}u09Bp1E3nzHi4)99$2L1qAW9P`
z02W44*epsivm8XGK7?|knC#L?V(_*PgF_!n65L*&#cbguS8=NNcv#tldy*doaBnj3
z9WfY8n1#CJm0?9!KfQ9`!hF!{2rArnK5~8PpWTsfeC;Y?z6SLTG{!DON~Uh8d(z0B
zk_OKw^9C)@aoA1Pp2hGD`_EZX%gDQm-Mm^MZYA7H2398nYpr*W4tay@l>U$vTJO2?
z#^tBNOx*2N)~(+TH8d>ep6``8V=3JEfdUUahVZ-xN+k#V&32x|%qnX(XBii5<@`%^
zV#Ky4f1!6RJqJXBU3M4~tmj2;;r`8_j&w?h5g35uMH(QI$Xpe<SoDfuyBvJ$AWs6K
z6zg=ID-g$VpJuH=3<<;&{JVg6CeE#{VqQ)i3=pm|43N08<5$`WT7dCf(JjIzJh>sb
zG|*XRT?kh6M(jj0Y&vF^M*9g-iDMW%G%9%Pa}6ERQ9b0%6z1v}Ja=|L@G#5ZI>JS9
z*(K12nMvS?oyG8s9|q~{w`ajtI`KSHSiJ;)%X@M&eCE(VqI#F(XL?L@A$TUT?6av5
zkPWIR391XjSC%d6L}7F71Qpw(;c_~)mSZo-&Fm^FHlPX|Fu}1B3E+9j0}o1a(4HFS
zUItE22CC%XZi!b4%~vWn>rpV9&CUEvt!?Q{Pr*L~51&(0Sz{VJJFrJtWw2PwXd|J{
zgH%3vAY$flodH=4&ruCHX;(3t;o}n?!0~3EE|5qRz$!VIkphxa4@_jyfiE9<B@ip?
z)JovR1W?*3um<3*q6-Zsm{E?ROduKC3|v9dEPGw}5LGFvN0rp@as&5IxNxF!c>m;0
zjcYJ2;26N&MTB8X4joZ&?SUe|VS$^I%dt{!c2O;%3SdqW@K_14r8eyC1s&VcU5+2~
z_O1Cc*w|aIA=VC6AT_EFoL}W#Rl;7CZe)e}RS*e;8CVyM6i8a(yO@|S709VYY(y2g
zc+QxB>Bw^B^2Db~*o)=i$m-aUNQFkYy5(eJW$cez>C{POds*p3cy#tHnvActP;dBP
zdEf)C;lq}&#PE?XCD<~ngrzYUg|nS`#MS`Rd7cT>xlR19P#~4Qg5!J}@glCUq)z_2
zj<XRy%t~Rq!qTH+WUjDx6$5&J82?9%V~F+uSwAX9-8kA;fhtqag;&?-m-?|B<%=pU
Jo|kP+{{fTh%QOH0

literal 0
HcmV?d00001

diff --git a/samples/AotTestApp/Assets/Square150x150Logo.scale-200.png b/samples/AotTestApp/Assets/Square150x150Logo.scale-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..53ee3777ea27e31b260014cf4074099874ff933a
GIT binary patch
literal 1755
zcmZvde@q)?7{{+i3tS0qt7{iJ0{^s_^@sZdMMEaBz#P|xjghsxG)6Bvp>vyv%aSq0
z)njao1dV0XNw&c@qmj1e*jgQ$l@_urW5G4RSY#rT1z`#%3;{EB`aJK|TH^lb_3nAT
z-_Q4X-(K&IS8UyqsnjYdippfmN-HT!X2MT;Dpcy~-#<W6spr^I%Z`I%bK{M*>$k6V
z|M<iW^=g++e@Rx7_LHHnqU2;@`i?tCD}@7f%KSi0pe1~`>R4vU#O&p7TC46pTflb3
zoUJ;ZRf#&8&EwXy5s%!&(q6cN62swD#FH%O-RJsjWPZN3^^@FCIQ&MxXIFo7!I#VI
zkpIstuWqUV5uhgs07?k$*!`uiZ=5b#$lI|0c+XJv<J{p}RUOaNKQ<im@QX7O-EXm%
zZcW#Y{k<Xj`b3r{sN?i*g_&_g1h3pjaUinim|Uz#k6!n{*P)(fetc%Zzt*YppIPkb
zZsrI7$ZjjP2{*TQ)Rl{qr%&KH`*A*c407bjGC(`YTWo?_?9@jM>j(}zSE3MN#EyOK
zql(#yA}~Ibl*r(s1}Z^5mmn*-n93g?-ccM+^PN?6HH~h0hjy6@XY*^i<-V)+OZ;p7
z7j`p_sT55xnYsedNIIel^QIIg7i@`2Qi}x5$!t<wREe9#D@+!fNFxx26>k29$2OQI
zs^kQXAKE}5ZJu$)2@Dxn?}}O@f@6@^!%9Tj+o>=jd!^ZuvBE4jb4g}Z5WMBtcmy^~
zoFGVS5|0FA!(1Q%fL?Bj*L+9ZL<k)9Dx8*ddZZzsW5_{0!wC)<wtN(l?357%26r2H
z)e$Rfj*{dnkRG6kTutOTQgC@J7A}iDXxc^vHXjS@l%c&nv^>{mjSO8lzqrQ0UCZ)X
zPwk$1HNFgaK%NxGpuXz}#ywXvf2JQ?BQ5uOZM2up4S#ieaxS$<UJ>!o9o6<b*PRMe
zw2N}mUfxcbWj4{^_PX_)#THTdzfHx$q43G!7i`-0rv|IVjoNMZ?s})oX>Z=czNQb}
zwAh|xLZ>+WyN%o?^uCAQw&&4o?S$DJ`WP(Hr*grL*qNXlqU0osCQ(Up<yn-Y+UUBH
z0`~|C21=1cK(XdDQ&fpwMc`nfH~_za8nMvP_<v3_Cm2%+xmlLs@U08}yC|SVtuf?a
zLlnGjh0&5BVK|8+M~tFDgR?Lk+<}n5F-|E}GV5KkJ@<Jy+C)_l2)JQFTPN%#u<<5B
zxPSy;gG2(fZvqUoAprgg&;|koNCXG~f;64RuX7>5F(^$Z5;n&oJIO4uF`k&QL*j{f
zU=;#MZ5{@b%qMbjTB3dh-5#mqY><S4qcBmkQW*|18RL|}ppv?cijSrWPC^)2g5{Tu
zT0W#@oVoK%XJ|$oIjS&T`!v+Nezc|NwrKchuXB25ZNFe2+%-J5#HIKRux*I`4`57B
zQ0dHlb#ISPztmwXuXHRwcyab3<L}+G@K@Q;cQ31~kA4Gu{(I}M7xUNx6YKkaZ}wGk
s29I{~!hlCRd13tTX`du`*!lx~{^^p-x%)@fz)Oo_H*YQdqL>%{0jgS+WdHyG

literal 0
HcmV?d00001

diff --git a/samples/AotTestApp/Assets/Square44x44Logo.scale-200.png b/samples/AotTestApp/Assets/Square44x44Logo.scale-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..f713bba67f551ef91020b75716a4dc8ebd744b1c
GIT binary patch
literal 637
zcmeAS@N?(olHy`uVBq!ia0vp^5g^RL1|$oo8kjIJFu8cTIEGZ*dUI*J;2{SImxtDO
zm%3!R$UazoY}x{$j0P5ABYXWr(l=jxJ6ps1W{tV=^>{Dl><3nv3A}sm=EZ)#l3`NR
zpZda3^rNox*D1%NC98Z~L*6zipLw~Gxn&(Y-;KmJ+aR6eLabU-L#y8HW%7P<VMos8
zqX*Kbh`RaZ-Vu7P$7Xg$t7p!w9mNuLWx4O|3Z&Q;DexQ@4z03gU_T+dV)?TB4XaLx
zKHv%Qc0OMANu|zE*>-E_-<YK1`Q@gsru}A0v3eK#yt;t5sDM}IiBJqP`%aeY2ORYd
znig=vgoGzD?qE|>VlLqIabbHPHKT*)fT@9iWJ7iWgOT9%0}Lrj>lztPxWq6sPw3pi
z#-<=#$jjrP_DD*i!RLsn0mIA=><W)5lpnuqp4YHjx%_x(aT1U|479<C?V*%JOU*Sg
z#_I<Zo_I#HfQ-%GC$U@ez*0u_CX-g5eG;<;W<|4PbM4IJzI;b1;`rIJXmOF0#Dc%g
zZLbuBxUL^m=x+0N7USD){mHGN{Xv<#-5>4~N)IMYWIf=j%-zuKCdMG%tHYot70D1|
zvWa0wMhauW#S>1CnI_;>!1Q3zMA17@DOVq{MQ+{U7^a&yA+%dMCG;WNPV0i;w$tu;
zX^b}UKziPM)(<;)ruW;-`)bBN+rQNM*Zs_>?n$|FVFo-e*PZb*@U7VAd+tHb4e<vm
d2N?b27$xG?o#1Ly5CkSG22WQ%mvv4FO#oV^_;~;T

literal 0
HcmV?d00001

diff --git a/samples/AotTestApp/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/samples/AotTestApp/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc9f5bea0c3b191b5e9e13e92fcb488a8a766bd0
GIT binary patch
literal 283
zcmV+$0p$LPP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002uNkl<Zc-pm;
z$63TM6bA9G*Xc}XfD+UJ=|T=ys-PH76hMXs+<+P&S3!<LhDZG6)%(7=&RDjelDe*Y
zVonR9P71Gc1N(5+&{@F%lu&&PoInMO-~;6j)?f@)>?=Blc~}S6K)wL}r*Gf`BM#QB
z+y>N$mCswb4d{^{<t89R6uAiq5i9?54}{1(JkAEp8F^U1M0O#83GgwliUjUs+(iyH
zU;-wUJ!uK@Iq>S9v_!eQj4fTRMOwOCi?lSk9%<=vAz}jM-*PQtH@Odn1LZcd^j#o>
hW$4xn+CT+ep9lJ{OAO?njobhL002ovPDHLkV1nYebbkN<

literal 0
HcmV?d00001

diff --git a/samples/AotTestApp/Assets/StoreLogo.png b/samples/AotTestApp/Assets/StoreLogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4586f26bdf7841cad10f39cdffe2aca3af252c1
GIT binary patch
literal 456
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fF!p=8IEGZ*dUM0H=rDtTTVkd2
z(%lbKn@VS_lUaADVB&;Z6F#LM+mPsa?e>FnHo;HND^!P`-lX%BH~FOg%y&x+t*x!?
zg$#_1A1kgsSvO(fw`bOmo;lrJX<ItGX8p^+)vNqf=Q|piE^xcD$ZJ36qIG6c9Wn9W
zgiF^fyRvIlz4DPIUZ0)bU14fm$xyiFTenPIFjFvNlH=XI+>8byO1j^gf7qohR%mmt
z@L)WX;>gqgK|tWJvQ5j;4;=gt4HXVKSMYRv5RhY5vS~TqfK_NAP*r{h!!g^BZ;w4r
z7CGdsai)y<gGsuj!2jo4dH!kJEjuUGJ5jrV^^fTM+?I6=Vq5$l{O<YKaqNHux6=a&
zZkGiT+-?aH-R=fh@nb<l3GD`pLjs}+YZ#IQokJQ7861;$eO|ZgF2kZz#SEEoCmzcz
z2tM$>;fJQc`7{Zc2b==h%o`Op$|bg6a&nL{*m7-=0>k4M4-PXlU;G-?%*(*g>iFt^
U$m#7DfHB12>FVdQ&MBb@0G`#n8vp<R

literal 0
HcmV?d00001

diff --git a/samples/AotTestApp/Assets/Wide310x150Logo.scale-200.png b/samples/AotTestApp/Assets/Wide310x150Logo.scale-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b4a5d0dd5f6c6ab408e1edf04a07888859a9eab
GIT binary patch
literal 2097
zcmc&$ZA@EL7(Q+3r2+3&!t4k)FxZ4;Vj0QoMdu<_3Kciz7YR4=A(qT^w)Jxi;?x!9
zuyq6dMF?b>c0sq%A~kJcD9FY~qQRMt?ZR3YyDZt}Od;|mgpc{2dv9AHF){kXU%k({
z=Y8JidEayHTkG@twPZ|U3_^%3ct-OgLSiFAqDN!|tbCX@c@?4P`2x*TMK!+Q4b?k0
ziW7!!KF6dPWcF<%I|iznM~`QJ_V7sHGV_D`dhgpA9Vd@&X}ErK+j~_rdv;Bp?OA@a
zFXOk7eWOJe5NcK;6h$FaM<R8n2&If8B!^r8(M2K*Wi$uP6%uY2h7c5jIOy*=@GeaG
zk2zK+7IduRP}>&7JxNc#-@QTwzW6x#d_z<n*&H+f#4hRlvzx*`m}NokI(>mQNkz5)
zPI;kh;3d;5UCJU+9a(cOxX(|edWoOiAEdGU#kPJ&xnc2||3vDbuhBCkj-pb0as$Zl
z5;}4n=**n6(1g`JEtSy;SG6X;#-F~Oz3lESG2b5`j<s|Qk9||T+vZq0?LoR=o9C9a
zyR%`V_x2UfL94qBs88m)Qdw|qBL@>@wAwY4Yp<=4Xeb>iH=6aicF?DxD&q{`!&}ct
zBI)aycwuobQAf&678Uf+Mmh-@9RUhyH~>?w0dixO0#jZjEc9R^=5NZw=|a(kcB?9^
zfnTiEFXp-q#B;Tn>(O%$A*ud^Rg&eVH6Y_5Y%!E39RR&s?XpG`gKwU!6<ah5%>FE1
z7X)DC7)*(5g}lh`4`{i~DZcWupZI`K)_4P)VE{@gc7@Xsd^86zl~_mOYH?I4!aGeX
z^E(_=L6?PgveDQ+r%P@UISEXrkn`LHJZ##+!-anV>6h)Ik<DtItE{23QQzKv`Y4^v
z8=ZLL+Z^FB*^&Mzi<UM}f$ETGCC%@es^mN<bJoD1diHUjr;FVL=e5QYT)8(ruH3ox
zkOXdF(#8wbdn$2F#5!fF57(5PI)h1c%A7SYSn6N-MGrA%=E%9A)svHNrOgZCgbcRn
z-X~*U=P_DW+2T?W$~2<(Btuu9C2$3fow=WhZKQFd-2p!Mzrc7CIFL1}yqGz_a8Pcr
zIbuP-Go6>Kp;E@p8+3&(5%kS2)ld*J*rJccZM0iyaAx7+F~GW1UWFK&3X$PE1^}NH
zgAG9ck5<?(B)~qL97!mF)l<VKz}JwKV}X!OlArx6Y&~U))tQoP!Ph^k(v*}fFBO?%
zsjN)rZCn|(9m<XQu5IUjRaiLZ0*m5-LhHhp&tSo_amEO6e5w~R{(;|-xFiDQslh}n
z+|1<SfCv~8MVRaL_>K!{07OwU@j@Do>TbH=CDEo#4m0cEyAuXy_<&jlzJVcKweSJ5
z&=q~iIn18$w8yb=rmEmHxVEUA^?RwnB?6Qlp1os8@*dWTGL2bhzZ!s*xqScR?EPL`
zo(JwNdKUUYy7GtvZ3asXm)cgFvCx9EmAi;|w=a0iGiv%%VYKh`P0Wma4y`Xyx|T~(
zAmfGbgbEEC7)j8b@WA@+5W3a61HJXC1dX@6_T|Czk0I0zBk%tnW~()VWITGI!`$c<
gARL?UBrYYkwoDw4eo*CrzXGTrZ@;GF>596)00d&n@&Et;

literal 0
HcmV?d00001

diff --git a/samples/AotTestApp/BlankPage1.xaml b/samples/AotTestApp/BlankPage1.xaml
new file mode 100644
index 00000000..ea436847
--- /dev/null
+++ b/samples/AotTestApp/BlankPage1.xaml
@@ -0,0 +1,56 @@
+<Page x:Class="AotTestApp.BlankPage1"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:tv="using:WinUI.TableView"
+      xmlns:local="using:AotTestApp"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      mc:Ignorable="d">
+
+    <Grid>
+        <tv:TableView x:Name="TableView1"
+                      AutoGenerateColumns="False"
+                      ShowExportOptions="True"
+                      ItemsSource="{x:Bind ViewModel.Items}">
+            <tv:TableView.RowDetailsTemplate>
+                <DataTemplate x:DataType="local:ExampleModel">
+                    <PersonPicture ProfilePicture="{x:Bind Avatar}"
+                                   Width="100"
+                                   Height="100"
+                                   Initials="{x:Bind Id}"
+                                   HorizontalAlignment="Left" />
+                </DataTemplate>
+            </tv:TableView.RowDetailsTemplate>
+            <tv:TableView.Columns>
+               <tv:TableViewNumberColumn Header="ID"
+                                          Width="80"
+                                          Binding="{Binding Id}" />
+                 <tv:TableViewTextColumn Header="First Name"
+                                        Binding="{Binding User.FirstName}" />
+                <tv:TableViewTextColumn Header="Last Name"
+                                        Binding="{Binding User.LastName}" />
+                <tv:TableViewComboBoxColumn Header="Gender"
+                                            Binding="{Binding User.Gender}"
+                                            ItemsSource="{x:Bind ViewModel.Genders}" />
+                <tv:TableViewTextColumn Header="Email"
+                                        Binding="{Binding User.Email}" />
+                <tv:TableViewComboBoxColumn Header="Designation"
+                                            Binding="{Binding Designation}"
+                                            DisplayMemberPath="Title"
+                                            SortMemberPath="Designation.Title"
+                                            ItemsSource="{x:Bind ViewModel.Designations}" />
+                <tv:TableViewDateColumn Header="Date of Birth"
+                                        Binding="{Binding Path=User.Dob}" />
+               <tv:TableViewTimeColumn Header="Active At"
+                                        Binding="{Binding ActiveAt}" />
+                <tv:TableViewCheckBoxColumn Header="Is Active"
+                                            Binding="{Binding IsActive}" />
+                <tv:TableViewHyperlinkColumn Header="Avatar Url"
+                                             Binding="{Binding Avatar}"
+                                             ContentBinding="{Binding User.FirstName}"/>
+            </tv:TableView.Columns>
+        </tv:TableView>
+    </Grid>
+</Page>
+
+
diff --git a/samples/AotTestApp/BlankPage1.xaml.cs b/samples/AotTestApp/BlankPage1.xaml.cs
new file mode 100644
index 00000000..554a126f
--- /dev/null
+++ b/samples/AotTestApp/BlankPage1.xaml.cs
@@ -0,0 +1,36 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using WinUI.TableView;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace AotTestApp;
+/// <summary>
+/// An empty page that can be used on its own or navigated to within a Frame.
+/// </summary>
+public sealed partial class BlankPage1 : Page
+{
+    public BlankPage1()
+    {
+        InitializeComponent();
+
+        MainViewModel.InitializeItems();
+        ViewModel = new MainViewModel();
+    }
+
+    public MainViewModel ViewModel { get; }
+
+}
diff --git a/samples/AotTestApp/DataFaker.cs b/samples/AotTestApp/DataFaker.cs
new file mode 100644
index 00000000..53979988
--- /dev/null
+++ b/samples/AotTestApp/DataFaker.cs
@@ -0,0 +1,234 @@
+using System;
+using System.Collections.Generic;
+
+namespace AotTestApp;
+
+/// <summary>
+/// A native AOT-compatible data faker for generating sample data.
+/// </summary>
+public static class DataFaker
+{
+    private static readonly Random _random = new();
+
+    // First names
+    private static readonly string[] FirstNames =
+    [
+        "James", "Mary", "Robert", "Patricia", "Michael", "Jennifer", "William", "Linda", "David", "Barbara",
+        "Richard", "Elizabeth", "Joseph", "Susan", "Thomas", "Jessica", "Charles", "Sarah", "Christopher", "Karen",
+        "Daniel", "Nancy", "Matthew", "Lisa", "Anthony", "Betty", "Mark", "Margaret", "Donald", "Sandra",
+        "Steven", "Ashley", "Paul", "Kimberly", "Andrew", "Donna", "Joshua", "Carol", "Kenneth", "Michelle",
+        "Kevin", "Emily", "Brian", "Melissa", "George", "Deborah", "Edward", "Stephanie", "Ronald", "Rebecca",
+        "Timothy", "Sharon", "Jason", "Brenda", "Jeffrey", "Amber", "Ryan", "Anna", "Jacob", "Pamela",
+        "Gary", "Nicole", "Nicholas", "Emma", "Eric", "Helen", "Jonathan", "Samantha", "Stephen", "Katherine"
+    ];
+
+    // Last names
+    private static readonly string[] LastNames =
+    [
+        "Smith", "Johnson", "Williams", "Brown", "Jones", "Garcia", "Miller", "Davis", "Rodriguez", "Martinez",
+        "Hernandez", "Lopez", "Gonzalez", "Wilson", "Anderson", "Thomas", "Taylor", "Moore", "Jackson", "Martin",
+        "Lee", "Perez", "Thompson", "White", "Harris", "Sanchez", "Clark", "Ramirez", "Lewis", "Robinson",
+        "Walker", "Young", "Allen", "King", "Wright", "Scott", "Torres", "Peterson", "Phillips", "Campbell",
+        "Parker", "Evans", "Edwards", "Collins", "Reyes", "Stewart", "Morris", "Morales", "Murphy", "Cook",
+        "Rogers", "Morgan", "Peterson", "Cooper", "Reed", "Bell", "Gomez", "Murray", "Freeman", "Wells",
+        "Webb", "Simpson", "Stevens", "Tucker", "Porter", "Hunter", "Hicks", "Crawford", "Henry", "Boyd"
+    ];
+
+    // Job titles
+    public static readonly Designation[] JobTitles =
+    [
+        new(1,"Software Developer"),
+        new(2,"Manager"),
+        new(3,"Sales Representative") ,
+        new(4,"Accountant") ,
+        new(5,"Analyst"),
+        new(6,"Engineer"),
+        new(7,"Designer"),
+        new(8,"Teacher"),
+        new(9,"Consultant"),
+        new(10,"Executive"),
+        new(11,"Administrator"),
+        new(12,"Coordinator"),
+        new(13,"Director"),
+        new(14,"Supervisor"),
+        new(15,"Specialist"),
+        new(16,"Technician"),
+        new(17,"Operator"),
+        new(18,"Clerk"),
+        new(19,"Assistant"),
+        new(20,"Officer"),
+        new(21,"Agent"),
+        new(22,"Associate"),
+        new(23,"Architect"),
+        new(24,"Planner"),
+        new(25,"Scientist"),
+        new(26,"Researcher"),
+        new(27,"Programmer"),
+        new(28,"Nurse"),
+        new(29,"Doctor"),
+        new(30,"Lawyer"),
+        new(31,"Marketing Manager"),
+        new(32,"Product Manager"),
+        new(33,"Business Analyst"),
+        new(34,"Data Scientist"),
+        new(35,"DevOps Engineer")
+    ];
+
+    // Department names
+    private static readonly string[] Departments =
+    [
+        "Sales", "Marketing", "Engineering", "Finance", "Human Resources",
+        "Operations", "IT", "Legal", "Research", "Development",
+        "Quality Assurance", "Customer Service", "Production", "Logistics", "Planning",
+        "Maintenance", "Administration", "Strategic Planning", "Corporate Communications", "Treasury"
+    ];
+
+    // Street suffixes
+    private static readonly string[] StreetSuffixes =
+    [
+        "Street", "Avenue", "Road", "Boulevard", "Drive", "Lane", "Court", "Circle",
+        "Way", "Parkway", "Plaza", "Square", "Trail", "Ridge", "Hill", "Oak"
+    ];
+
+    // Cities
+    private static readonly string[] Cities =
+    [
+        "New York", "Los Angeles", "Chicago", "Houston", "Phoenix",
+        "Philadelphia", "San Antonio", "San Diego", "Dallas", "San Jose",
+        "Austin", "Jacksonville", "Seattle", "Denver", "Boston",
+        "Portland", "Miami", "Atlanta", "Las Vegas", "Detroit"
+    ];
+
+    // States
+    private static readonly string[] States =
+    [
+        "AL", "AK", "AZ", "AR", "CA", "CO", "CT", "DE", "FL", "GA",
+        "HI", "ID", "IL", "IN", "IA", "KS", "KY", "LA", "ME", "MD",
+        "MA", "MI", "MN", "MS", "MO", "MT", "NE", "NV", "NH", "NJ",
+        "NM", "NY", "NC", "ND", "OH", "OK", "OR", "PA", "RI", "SC",
+        "SD", "TN", "TX", "UT", "VT", "VA", "WA", "WV", "WI", "WY"
+    ];
+
+    private static readonly string[] Regions = [
+        "East", "West", "North", "South"
+    ];
+
+    // Genders
+    private static readonly string[] Genders = ["Male", "Female", "Non-binary", "Genderfluid", "Agender", "Bigender", "Genderqueer", "Two-Spirit", "Prefer not to say"];
+
+    // Avatar images (using placeholder service URLs)
+    private static readonly string[] AvatarSeeds =
+    [
+        "avatar1", "avatar2", "avatar3", "avatar4", "avatar5",
+        "avatar6", "avatar7", "avatar8", "avatar9", "avatar10"
+    ];
+
+    public static string FirstName()
+    {
+        return FirstNames[_random.Next(FirstNames.Length)];
+    }
+
+    public static string LastName()
+    {
+        return LastNames[_random.Next(LastNames.Length)];
+    }
+
+    public static string FullName()
+    {
+        return $"{FirstName()} {LastName()}";
+    }
+
+    public static string Email(string? firstName = null, string? lastName = null)
+    {
+        firstName ??= FirstName();
+        lastName ??= LastName();
+        var domains = new[] { "example.com", "test.com", "sample.com", "data.com" };
+        var domain = domains[_random.Next(domains.Length)];
+        return $"{firstName.ToLower()}.{lastName.ToLower()}@{domain}";
+    }
+
+    public static string Gender()
+    {
+        return Genders[_random.Next(Genders.Length)];
+    }
+
+    public static DateOnly PastDate(int yearsBack = 50, DateOnly? maxDate = null)
+    {
+        maxDate ??= DateOnly.FromDateTime(DateTime.Now);
+        var startDate = maxDate.Value.AddYears(-yearsBack);
+        var daysRange = maxDate.Value.DayNumber - startDate.DayNumber;
+        var randomDays = _random.Next(daysRange);
+        return startDate.AddDays(randomDays);
+    }
+
+    public static TimeOnly TimeOfDay()
+    {
+        var hours = _random.Next(0, 24);
+        var minutes = _random.Next(0, 60);
+        var seconds = _random.Next(0, 60);
+        return new TimeOnly(hours, minutes, seconds);
+    }
+
+    public static bool Boolean(float truePercentage = 0.5f)
+    {
+        return _random.NextSingle() < truePercentage;
+    }
+
+    public static int Integer(int min = 0, int max = int.MaxValue)
+    {
+        return _random.Next(min, max);
+    }
+
+    public static decimal Decimal(decimal min = 0, decimal max = 1000)
+    {
+        return ((decimal)_random.NextDouble() * (max - min)) + min;
+    }
+
+    public static string Department()
+    {
+        return Departments[_random.Next(Departments.Length)];
+    }
+
+    public static Designation JobTitle()
+    {
+        return JobTitles[_random.Next(JobTitles.Length)];
+    }
+
+    public static string Address()
+    {
+        var streetNumber = _random.Next(1, 9999);
+        var streetName = FirstName();
+        var suffix = StreetSuffixes[_random.Next(StreetSuffixes.Length)];
+        var city = Cities[_random.Next(Cities.Length)];
+        var state = States[_random.Next(States.Length)];
+        var zip = _random.Next(10000, 99999);
+        return $"{streetNumber} {streetName} {suffix}, {city}, {state} {zip}";
+    }
+
+    public static string Avatar()
+    {
+        var seed = AvatarSeeds[_random.Next(AvatarSeeds.Length)];
+        var id = _random.Next(1, 100);
+        return $"https://api.dicebear.com/7.x/avataaars/svg?seed={seed}{id}";
+    }
+
+    public static string ZipCode()
+    {
+        return _random.Next(10000, 99999).ToString();
+    }
+
+    public static string State()
+    {
+        return States[_random.Next(States.Length)];
+    }
+
+    public static string Region()
+    {
+        return Regions[_random.Next(Regions.Length)];
+    }
+
+    public static string City()
+    {
+        return Cities[_random.Next(Cities.Length)];
+    }
+}
diff --git a/samples/AotTestApp/ExampleModel.cs b/samples/AotTestApp/ExampleModel.cs
new file mode 100644
index 00000000..a06d5db2
--- /dev/null
+++ b/samples/AotTestApp/ExampleModel.cs
@@ -0,0 +1,73 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+
+namespace AotTestApp;
+
+public partial class Designation : ObservableObject
+{
+    public Designation(int id, string? title)
+    {
+        Id = id;
+        Title = title;
+    }
+
+    [ObservableProperty]
+    public partial int Id { get; set; }
+
+
+    [ObservableProperty]
+    public partial string? Title { get; set; }
+}
+
+public partial class User : ObservableObject
+{
+    [ObservableProperty]
+    [Display(ShortName = "First Name")]
+    public partial string? FirstName { get; set; }
+
+    [ObservableProperty]
+    [Display(ShortName = "Last Name")]
+    public partial string? LastName { get; set; }
+
+    [ObservableProperty]
+    public partial string? Email { get; set; }
+
+    [ObservableProperty]
+    public partial string? Gender { get; set; }
+
+    [ObservableProperty]
+    public partial DateOnly Dob { get; set; }
+}
+
+public partial class ExampleModel : ObservableObject
+{
+    [ObservableProperty]
+    public partial int Id { get; set; }
+
+    [ObservableProperty]
+    [Display(ShortName = "Active At")]
+    public partial TimeOnly ActiveAt { get; set; }
+
+    [ObservableProperty]
+    [Display(ShortName = "Is Active")]
+    public partial bool IsActive { get; set; }
+
+    [ObservableProperty]
+    public partial string? Department { get; set; }
+
+    [ObservableProperty]
+    public partial Designation? Designation { get; set; }
+
+    [ObservableProperty]
+    public partial string? Address { get; set; }
+
+    [ObservableProperty]
+    [Display(AutoGenerateField = false)]
+    public partial string? Avatar { get; set; }
+
+    public Uri AvatarUrl => new(Avatar ?? string.Empty);
+
+    [ObservableProperty]
+    [Display(AutoGenerateField = false)]
+    public partial User? User { get; set; }
+}
diff --git a/samples/AotTestApp/MainViewModel.cs b/samples/AotTestApp/MainViewModel.cs
new file mode 100644
index 00000000..3eb10c13
--- /dev/null
+++ b/samples/AotTestApp/MainViewModel.cs
@@ -0,0 +1,72 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using System.Collections.ObjectModel;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace AotTestApp;
+
+public partial class MainViewModel : ObservableObject
+{
+    public MainViewModel()
+    {
+        foreach (var item in ItemsList)
+        {
+            Items.Add(item);
+            Genders.Add(item.User?.Gender);
+            Departments.Add(item.Department);
+        }
+
+        Designations = [.. DataFaker.JobTitles];
+    }
+
+    public static void InitializeItems()
+    {
+        var startId = 1;
+        var startDate = new DateOnly(1970, 1, 1);
+
+        ItemsList.Clear();
+
+        for (var i = 0; i < 1_000; i++)
+        {
+            var firstName = DataFaker.FirstName();
+            var lastName = DataFaker.LastName();
+            var email = DataFaker.Email(firstName, lastName);
+            var gender = DataFaker.Gender();
+            var dob = DataFaker.PastDate(50, startDate);
+            ItemsList.Add(new ExampleModel
+            {
+                Id = startId++,
+                IsActive = DataFaker.Boolean(),
+                ActiveAt = DataFaker.TimeOfDay(),
+                Department = DataFaker.Department(),
+                Designation = DataFaker.JobTitle(),
+                Address = DataFaker.Address(),
+                Avatar = DataFaker.Avatar(),
+                User = new User
+                {
+                    FirstName = firstName,
+                    LastName = lastName,
+                    Email = email,
+                    Gender = gender,
+                    Dob = dob
+                }
+            });
+        }
+    }
+
+    public static List<ExampleModel> ItemsList { get; } = [];
+
+    [ObservableProperty]
+    public partial ObservableCollection<ExampleModel> Items { get; set; } = [];
+
+    public IList<string?> Genders { get; set; } = [];
+
+    public IList<string?> Departments { get; set; } = [];
+
+    public IList<Designation> Designations { get; set; } = [];
+
+    [ObservableProperty]
+    public partial ExampleModel? SelectedItem { get; set; }
+}
+
diff --git a/samples/AotTestApp/MainWindow.xaml b/samples/AotTestApp/MainWindow.xaml
new file mode 100644
index 00000000..396c5d45
--- /dev/null
+++ b/samples/AotTestApp/MainWindow.xaml
@@ -0,0 +1,19 @@
+<Window x:Class="AotTestApp.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:local="using:AotTestApp"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:tv="using:WinUI.TableView"
+        xmlns:tvControls="using:WinUI.TableView.Controls"
+        mc:Ignorable="d"
+        Title="AotTestApp">
+
+    <Window.SystemBackdrop>
+        <MicaBackdrop />
+    </Window.SystemBackdrop>
+
+    <Grid>
+        <local:BlankPage1 />
+    </Grid>
+</Window>
diff --git a/samples/AotTestApp/MainWindow.xaml.cs b/samples/AotTestApp/MainWindow.xaml.cs
new file mode 100644
index 00000000..fd4d239a
--- /dev/null
+++ b/samples/AotTestApp/MainWindow.xaml.cs
@@ -0,0 +1,12 @@
+using Microsoft.UI.Xaml;
+using WinUI.TableView;
+
+namespace AotTestApp;
+
+public sealed partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/samples/AotTestApp/Package.appxmanifest b/samples/AotTestApp/Package.appxmanifest
new file mode 100644
index 00000000..b6a63309
--- /dev/null
+++ b/samples/AotTestApp/Package.appxmanifest
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  IgnorableNamespaces="uap rescap">
+
+  <Identity
+    Name="e751642c-f325-47d5-a104-bf4a8713b3bd"
+    Publisher="CN=WaheedAhmed"
+    Version="1.0.0.0" />
+
+  <mp:PhoneIdentity PhoneProductId="e751642c-f325-47d5-a104-bf4a8713b3bd" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+
+  <Properties>
+    <DisplayName>AotTestApp</DisplayName>
+    <PublisherDisplayName>WaheedAhmed</PublisherDisplayName>
+    <Logo>Assets\StoreLogo.png</Logo>
+  </Properties>
+
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+  </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate"/>
+  </Resources>
+
+  <Applications>
+    <Application Id="App"
+      Executable="$targetnametoken$.exe"
+      EntryPoint="$targetentrypoint$">
+      <uap:VisualElements
+        DisplayName="AotTestApp"
+        Description="AotTestApp"
+        BackgroundColor="transparent"
+        Square150x150Logo="Assets\Square150x150Logo.png"
+        Square44x44Logo="Assets\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" />
+        <uap:SplashScreen Image="Assets\SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
+</Package>
diff --git a/samples/AotTestApp/Properties/launchSettings.json b/samples/AotTestApp/Properties/launchSettings.json
new file mode 100644
index 00000000..d571cee3
--- /dev/null
+++ b/samples/AotTestApp/Properties/launchSettings.json
@@ -0,0 +1,10 @@
+{
+  "profiles": {
+    "AotTestApp (Package)": {
+      "commandName": "MsixPackage"
+    },
+    "AotTestApp (Unpackaged)": {
+      "commandName": "Project"
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/AotTestApp/app.manifest b/samples/AotTestApp/app.manifest
new file mode 100644
index 00000000..c5cdad37
--- /dev/null
+++ b/samples/AotTestApp/app.manifest
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="AotTestApp.app"/>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- The ID below informs the system that this application is compatible with OS features first introduced in Windows 10. 
+      It is necessary to support features in unpackaged applications, for example the custom titlebar implementation.
+      For more info see https://docs.microsoft.com/windows/apps/windows-app-sdk/use-windows-app-sdk-run-time#declare-os-compatibility-in-your-application-manifest -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+    </application>
+  </compatibility>
+  
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </windowsSettings>
+  </application>
+</assembly>
\ No newline at end of file

From f9571af0296caeadce49696b428651695ee6aa3b Mon Sep 17 00:00:00 2001
From: Waheed Ahmad <waheed.ahmad92@outlook.com>
Date: Fri, 17 Apr 2026 17:15:06 +0500
Subject: [PATCH 09/17] update aot test app

---
 samples/AotTestApp/AotTestApp.csproj | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/samples/AotTestApp/AotTestApp.csproj b/samples/AotTestApp/AotTestApp.csproj
index 78db99e7..8d555f0c 100644
--- a/samples/AotTestApp/AotTestApp.csproj
+++ b/samples/AotTestApp/AotTestApp.csproj
@@ -7,7 +7,6 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Platforms>x86;x64;ARM64</Platforms>
     <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-    <PublishProfile>win-$(Platform).pubxml</PublishProfile>
     <UseWinUI>true</UseWinUI>
     <WinUISDKReferences>false</WinUISDKReferences>
     <EnableMsixTooling>true</EnableMsixTooling>
@@ -46,15 +45,11 @@
   
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Mvvm" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
     <PackageReference Include="Microsoft.WindowsAppSDK" />
   </ItemGroup>
   
   <ItemGroup>
     <ProjectReference Include="..\..\src\WinUI.TableView.csproj" />
-    <ProjectReference Include="..\..\generators\WinUI.TableView.SourceGenerators.csproj" 
-                      OutputItemType="Analyzer"
-                      ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <!--

From be2323c19dc4986980ef1a0ad45610f95922c6eb Mon Sep 17 00:00:00 2001
From: Waheed Ahmad <waheed.ahmad92@outlook.com>
Date: Thu, 23 Apr 2026 20:21:20 +0500
Subject: [PATCH 10/17] Refactor: move TableView to MainWindow, remove
 BlankPage1

---
 samples/AotTestApp/BlankPage1.xaml    | 56 ---------------------------
 samples/AotTestApp/BlankPage1.xaml.cs | 36 -----------------
 samples/AotTestApp/DataFaker.cs       |  4 +-
 samples/AotTestApp/ExampleModel.cs    |  3 ++
 samples/AotTestApp/MainViewModel.cs   | 10 ++---
 samples/AotTestApp/MainWindow.xaml    | 33 +++++++++++++++-
 samples/AotTestApp/MainWindow.xaml.cs |  5 +++
 7 files changed, 47 insertions(+), 100 deletions(-)
 delete mode 100644 samples/AotTestApp/BlankPage1.xaml
 delete mode 100644 samples/AotTestApp/BlankPage1.xaml.cs

diff --git a/samples/AotTestApp/BlankPage1.xaml b/samples/AotTestApp/BlankPage1.xaml
deleted file mode 100644
index ea436847..00000000
--- a/samples/AotTestApp/BlankPage1.xaml
+++ /dev/null
@@ -1,56 +0,0 @@
-<Page x:Class="AotTestApp.BlankPage1"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:tv="using:WinUI.TableView"
-      xmlns:local="using:AotTestApp"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      mc:Ignorable="d">
-
-    <Grid>
-        <tv:TableView x:Name="TableView1"
-                      AutoGenerateColumns="False"
-                      ShowExportOptions="True"
-                      ItemsSource="{x:Bind ViewModel.Items}">
-            <tv:TableView.RowDetailsTemplate>
-                <DataTemplate x:DataType="local:ExampleModel">
-                    <PersonPicture ProfilePicture="{x:Bind Avatar}"
-                                   Width="100"
-                                   Height="100"
-                                   Initials="{x:Bind Id}"
-                                   HorizontalAlignment="Left" />
-                </DataTemplate>
-            </tv:TableView.RowDetailsTemplate>
-            <tv:TableView.Columns>
-               <tv:TableViewNumberColumn Header="ID"
-                                          Width="80"
-                                          Binding="{Binding Id}" />
-                 <tv:TableViewTextColumn Header="First Name"
-                                        Binding="{Binding User.FirstName}" />
-                <tv:TableViewTextColumn Header="Last Name"
-                                        Binding="{Binding User.LastName}" />
-                <tv:TableViewComboBoxColumn Header="Gender"
-                                            Binding="{Binding User.Gender}"
-                                            ItemsSource="{x:Bind ViewModel.Genders}" />
-                <tv:TableViewTextColumn Header="Email"
-                                        Binding="{Binding User.Email}" />
-                <tv:TableViewComboBoxColumn Header="Designation"
-                                            Binding="{Binding Designation}"
-                                            DisplayMemberPath="Title"
-                                            SortMemberPath="Designation.Title"
-                                            ItemsSource="{x:Bind ViewModel.Designations}" />
-                <tv:TableViewDateColumn Header="Date of Birth"
-                                        Binding="{Binding Path=User.Dob}" />
-               <tv:TableViewTimeColumn Header="Active At"
-                                        Binding="{Binding ActiveAt}" />
-                <tv:TableViewCheckBoxColumn Header="Is Active"
-                                            Binding="{Binding IsActive}" />
-                <tv:TableViewHyperlinkColumn Header="Avatar Url"
-                                             Binding="{Binding Avatar}"
-                                             ContentBinding="{Binding User.FirstName}"/>
-            </tv:TableView.Columns>
-        </tv:TableView>
-    </Grid>
-</Page>
-
-
diff --git a/samples/AotTestApp/BlankPage1.xaml.cs b/samples/AotTestApp/BlankPage1.xaml.cs
deleted file mode 100644
index 554a126f..00000000
--- a/samples/AotTestApp/BlankPage1.xaml.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using WinUI.TableView;
-
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
-namespace AotTestApp;
-/// <summary>
-/// An empty page that can be used on its own or navigated to within a Frame.
-/// </summary>
-public sealed partial class BlankPage1 : Page
-{
-    public BlankPage1()
-    {
-        InitializeComponent();
-
-        MainViewModel.InitializeItems();
-        ViewModel = new MainViewModel();
-    }
-
-    public MainViewModel ViewModel { get; }
-
-}
diff --git a/samples/AotTestApp/DataFaker.cs b/samples/AotTestApp/DataFaker.cs
index 53979988..c85d7cc0 100644
--- a/samples/AotTestApp/DataFaker.cs
+++ b/samples/AotTestApp/DataFaker.cs
@@ -75,7 +75,7 @@ public static class DataFaker
     ];
 
     // Department names
-    private static readonly string[] Departments =
+    internal static readonly string[] Departments =
     [
         "Sales", "Marketing", "Engineering", "Finance", "Human Resources",
         "Operations", "IT", "Legal", "Research", "Development",
@@ -114,7 +114,7 @@ public static class DataFaker
     ];
 
     // Genders
-    private static readonly string[] Genders = ["Male", "Female", "Non-binary", "Genderfluid", "Agender", "Bigender", "Genderqueer", "Two-Spirit", "Prefer not to say"];
+    internal static readonly string[] Genders = ["Male", "Female", "Non-binary", "Genderfluid", "Agender", "Bigender", "Genderqueer", "Two-Spirit", "Prefer not to say"];
 
     // Avatar images (using placeholder service URLs)
     private static readonly string[] AvatarSeeds =
diff --git a/samples/AotTestApp/ExampleModel.cs b/samples/AotTestApp/ExampleModel.cs
index a06d5db2..fb225a43 100644
--- a/samples/AotTestApp/ExampleModel.cs
+++ b/samples/AotTestApp/ExampleModel.cs
@@ -3,6 +3,7 @@
 
 namespace AotTestApp;
 
+[WinRT.GeneratedBindableCustomProperty]
 public partial class Designation : ObservableObject
 {
     public Designation(int id, string? title)
@@ -19,6 +20,7 @@ public Designation(int id, string? title)
     public partial string? Title { get; set; }
 }
 
+[WinRT.GeneratedBindableCustomProperty]
 public partial class User : ObservableObject
 {
     [ObservableProperty]
@@ -39,6 +41,7 @@ public partial class User : ObservableObject
     public partial DateOnly Dob { get; set; }
 }
 
+[WinRT.GeneratedBindableCustomProperty]
 public partial class ExampleModel : ObservableObject
 {
     [ObservableProperty]
diff --git a/samples/AotTestApp/MainViewModel.cs b/samples/AotTestApp/MainViewModel.cs
index 3eb10c13..460150af 100644
--- a/samples/AotTestApp/MainViewModel.cs
+++ b/samples/AotTestApp/MainViewModel.cs
@@ -13,10 +13,10 @@ public MainViewModel()
         foreach (var item in ItemsList)
         {
             Items.Add(item);
-            Genders.Add(item.User?.Gender);
-            Departments.Add(item.Department);
         }
 
+        Genders = [.. DataFaker.Genders];
+        Departments = [.. DataFaker.Departments];
         Designations = [.. DataFaker.JobTitles];
     }
 
@@ -60,11 +60,11 @@ public static void InitializeItems()
     [ObservableProperty]
     public partial ObservableCollection<ExampleModel> Items { get; set; } = [];
 
-    public IList<string?> Genders { get; set; } = [];
+    public List<string?> Genders { get; set; } = [];
 
-    public IList<string?> Departments { get; set; } = [];
+    public List<string?> Departments { get; set; } = [];
 
-    public IList<Designation> Designations { get; set; } = [];
+    public List<Designation> Designations { get; set; } = [];
 
     [ObservableProperty]
     public partial ExampleModel? SelectedItem { get; set; }
diff --git a/samples/AotTestApp/MainWindow.xaml b/samples/AotTestApp/MainWindow.xaml
index 396c5d45..ee2e172c 100644
--- a/samples/AotTestApp/MainWindow.xaml
+++ b/samples/AotTestApp/MainWindow.xaml
@@ -14,6 +14,37 @@
     </Window.SystemBackdrop>
 
     <Grid>
-        <local:BlankPage1 />
+        <tv:TableView AutoGenerateColumns="False"
+                      ShowExportOptions="True"
+                      ItemsSource="{x:Bind ViewModel.Items}">
+            <tv:TableView.Columns>
+                <tv:TableViewNumberColumn Header="ID"
+                                          Width="80"
+                                          Binding="{Binding Id}" />
+                <tv:TableViewTextColumn Header="First Name"
+                                        Binding="{Binding User.FirstName}" />
+                <tv:TableViewTextColumn Header="Last Name"
+                                        Binding="{Binding User.LastName}" />
+                <tv:TableViewComboBoxColumn Header="Gender"
+                                            Binding="{Binding User.Gender}"
+                                            ItemsSource="{x:Bind ViewModel.Genders}" />
+                <tv:TableViewTextColumn Header="Email"
+                                        Binding="{Binding User.Email}" />
+                <tv:TableViewComboBoxColumn Header="Designation"
+                                            Binding="{Binding Designation}"
+                                            DisplayMemberPath="Title"
+                                            SortMemberPath="Designation.Title"
+                                            ItemsSource="{x:Bind ViewModel.Designations}" />
+                <tv:TableViewDateColumn Header="Date of Birth"
+                                        Binding="{Binding Path=User.Dob}" />
+                <tv:TableViewTimeColumn Header="Active At"
+                                        Binding="{Binding ActiveAt}" />
+                <tv:TableViewCheckBoxColumn Header="Is Active"
+                                            Binding="{Binding IsActive}" />
+                <tv:TableViewHyperlinkColumn Header="Avatar Url"
+                                             Binding="{Binding Avatar}"
+                                             ContentBinding="{Binding User.FirstName}" />
+            </tv:TableView.Columns>
+        </tv:TableView>
     </Grid>
 </Window>
diff --git a/samples/AotTestApp/MainWindow.xaml.cs b/samples/AotTestApp/MainWindow.xaml.cs
index fd4d239a..4457c08e 100644
--- a/samples/AotTestApp/MainWindow.xaml.cs
+++ b/samples/AotTestApp/MainWindow.xaml.cs
@@ -8,5 +8,10 @@ public sealed partial class MainWindow : Window
     public MainWindow()
     {
         InitializeComponent();
+
+        MainViewModel.InitializeItems();
+        ViewModel = new MainViewModel();
     }
+
+    public MainViewModel ViewModel { get; }
 }
\ No newline at end of file

From c71277ba9af02824f42187b7004e2e209bdfa322 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 17 May 2026 13:11:13 +0000
Subject: [PATCH 11/17] fix: guard column reorder on valid drop target

Agent-Logs-Url: https://github.com/w-ahmad/WinUI.TableView/sessions/08bc4d49-062b-4cbb-9955-6f6e2e1a2fbc

Co-authored-by: w-ahmad <17172092+w-ahmad@users.noreply.github.com>
---
 src/TableViewHeaderRow.cs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/TableViewHeaderRow.cs b/src/TableViewHeaderRow.cs
index 5c304c15..5b701f3c 100644
--- a/src/TableViewHeaderRow.cs
+++ b/src/TableViewHeaderRow.cs
@@ -42,6 +42,7 @@ public partial class TableViewHeaderRow : Control
     private bool _calculatingHeaderWidths;
     private DispatcherTimer? _timer;
     private int _dropColumnIndex;
+    private bool _isValidDropTarget;
     private readonly Dictionary<DependencyProperty, long> _callbackTokens = [];
 
     /// <summary>
@@ -524,6 +525,7 @@ internal void ShowColumnDropIndicator(double position, RenderTargetBitmap header
     {
         if (_columnDropIndicator is not null && FindHeader(new(position, ActualHeight / 2)) is { Column: { } dropColumn } dropHeader)
         {
+            _isValidDropTarget = true;
             _dropColumnIndex = TableView?.Columns.VisibleColumns.IndexOf(dropColumn) ?? 0;
             var transform = dropHeader.TransformToVisual(this);
             var dropHeaderX = transform.TransformPoint(new Point(0, 0)).X;
@@ -544,6 +546,15 @@ internal void ShowColumnDropIndicator(double position, RenderTargetBitmap header
                 _dragHeaderImage.Source = headerVisuals;
             }
         }
+        else
+        {
+            _isValidDropTarget = false;
+
+            if (_columnDropIndicator is not null)
+            {
+                _columnDropIndicator.Visibility = Visibility.Collapsed;
+            }
+        }
     }
 
     internal void ColumnDropCompleted(TableViewColumn column)
@@ -551,6 +562,13 @@ internal void ColumnDropCompleted(TableViewColumn column)
         if (TableView is not null && _columnDropIndicator is not null)
         {
             _columnDropIndicator.Visibility = Visibility.Collapsed;
+            var isValidDropTarget = _isValidDropTarget;
+            _isValidDropTarget = false;
+
+            if (!isValidDropTarget)
+            {
+                return;
+            }
 
             var sourceIndex = TableView.Columns.VisibleColumns.IndexOf(column);
             var dropIndex = sourceIndex > _dropColumnIndex ? _dropColumnIndex + 1 : _dropColumnIndex;

From 70032e555a54d72022f1748dd9b49f3684faed8d Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 18 May 2026 05:58:35 +0000
Subject: [PATCH 12/17] fix: avoid duplicate header option command handlers

Agent-Logs-Url: https://github.com/w-ahmad/WinUI.TableView/sessions/a6383031-ca65-4937-943e-5d0667f51cde

Co-authored-by: w-ahmad <17172092+w-ahmad@users.noreply.github.com>
---
 src/TableViewColumnHeader.OptionComamnds.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/TableViewColumnHeader.OptionComamnds.cs b/src/TableViewColumnHeader.OptionComamnds.cs
index a90976e9..fb78faca 100644
--- a/src/TableViewColumnHeader.OptionComamnds.cs
+++ b/src/TableViewColumnHeader.OptionComamnds.cs
@@ -7,6 +7,7 @@ namespace WinUI.TableView;
 
 partial class TableViewColumnHeader
 {
+    private bool _commandsInitialized;
     private readonly StandardUICommand _sortAscendingCommand = new() { Label = TableViewLocalizedStrings.SortAscending };
     private readonly StandardUICommand _sortDescendingCommand = new() { Label = TableViewLocalizedStrings.SortDescending };
     private readonly StandardUICommand _clearSortingCommand = new() { Label = TableViewLocalizedStrings.ClearSorting };
@@ -45,6 +46,11 @@ private void SetOptionCommands()
     /// </summary>
     private void InitializeCommands()
     {
+        if (_commandsInitialized)
+        {
+            return;
+        }
+
         _sortAscendingCommand.ExecuteRequested += delegate { DoSort(SD.Ascending); };
         _sortAscendingCommand.CanExecuteRequested += (_, e) => e.CanExecute = CanSort && Column?.SortDirection != SD.Ascending;
 
@@ -60,6 +66,7 @@ private void InitializeCommands()
         _okCommand.ExecuteRequested += delegate { ExecuteOkCommand(); };
 
         _cancelCommand.ExecuteRequested += delegate { HideFlyout(); };
+        _commandsInitialized = true;
     }
 
     internal void ExecuteOkCommand()

From ba7548b1ccd6aa54752a279cc4dfc139f52795b4 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 18 May 2026 06:03:02 +0000
Subject: [PATCH 13/17] fix: prevent duplicate header row option command
 handlers

Agent-Logs-Url: https://github.com/w-ahmad/WinUI.TableView/sessions/bd21d29e-08bf-43e6-a06e-3aea92fd9dbd

Co-authored-by: w-ahmad <17172092+w-ahmad@users.noreply.github.com>
---
 src/TableViewHeaderRow.OptionComamnds.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/TableViewHeaderRow.OptionComamnds.cs b/src/TableViewHeaderRow.OptionComamnds.cs
index 81382d4a..6d84a5ae 100644
--- a/src/TableViewHeaderRow.OptionComamnds.cs
+++ b/src/TableViewHeaderRow.OptionComamnds.cs
@@ -6,6 +6,7 @@ namespace WinUI.TableView;
 
 partial class TableViewHeaderRow
 {
+    private bool _commandsInitialized;
     private MenuFlyoutItem? _exportAllMenuItem;
     private MenuFlyoutItem? _exportSelectedMenuItem;
     private readonly StandardUICommand _selectAllCommand = new(StandardUICommandKind.SelectAll) { Label = TableViewLocalizedStrings.SelectAll };
@@ -71,6 +72,11 @@ private void SetOptionCommands()
     /// </summary>
     private void InitializeCommands()
     {
+        if (_commandsInitialized)
+        {
+            return;
+        }
+
         _selectAllCommand.Description = TableViewLocalizedStrings.SelectAllCommandDescription;
         _selectAllCommand.ExecuteRequested += delegate { TableView?.SelectAll(); };
         _selectAllCommand.CanExecuteRequested += CanExecuteSelectAllCommand;
@@ -97,6 +103,7 @@ private void InitializeCommands()
 
         _exportSelectedToCSVCommand.ExecuteRequested += delegate { TableView?.ExportSelectedToCSV(); };
         _exportSelectedToCSVCommand.CanExecuteRequested += CanExecuteExportSelectedToCSVCommand;
+        _commandsInitialized = true;
     }
 
     private void CanExecuteSelectAllCommand(XamlUICommand sender, CanExecuteRequestedEventArgs e)

From 617447431b2c607aa2226f46d4b10d34dfb73378 Mon Sep 17 00:00:00 2001
From: Waheed Ahmad <waheed.ahmad92@outlook.com>
Date: Mon, 18 May 2026 13:55:48 +0500
Subject: [PATCH 14/17] put back the PreviewKeyDown event handler

---
 src/TableViewColumnHeader.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/TableViewColumnHeader.cs b/src/TableViewColumnHeader.cs
index cb0330c1..a2ffbf03 100644
--- a/src/TableViewColumnHeader.cs
+++ b/src/TableViewColumnHeader.cs
@@ -255,6 +255,9 @@ protected override void OnApplyTemplate()
                 _filterItemsControl.TableView = _tableView;
                 _filterItemsControl.ColumnHeader = this;
             }
+            
+            // Handle Space key to prevent MenuFlyoutItem performing click action.
+            filterItemsMenuItem.PreviewKeyUp += static (_, e) => e.Handled = e.Key is VirtualKey.Space;
         }
 
         SetOptionCommands();

From ec65bc54d1f3856d8fc5d9a255f2cb1f4586bb39 Mon Sep 17 00:00:00 2001
From: Waheed Ahmad <waheed.ahmad92@outlook.com>
Date: Tue, 19 May 2026 13:27:39 +0500
Subject: [PATCH 15/17] Refactor TypeExtensions for efficiency

---
 src/Extensions/TypeExtensions.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Extensions/TypeExtensions.cs b/src/Extensions/TypeExtensions.cs
index ffb3672f..13b83f17 100644
--- a/src/Extensions/TypeExtensions.cs
+++ b/src/Extensions/TypeExtensions.cs
@@ -124,7 +124,7 @@ public static bool IsPrimitive(this Type? dataType)
     /// </summary>
     public static bool IsInheritedFromIComparable(this Type type)
     {
-        return type.GetInterfaces().Any(i => i == typeof(IComparable));
+        return typeof(IComparable).IsAssignableFrom(type);
     }
 
     private static Type? FindGenericType(Type definition, Type type)

From 70dcf1c051066df9ede6b1fbb514f1024f46d749 Mon Sep 17 00:00:00 2001
From: Waheed Ahmad <waheed.ahmad92@outlook.com>
Date: Tue, 19 May 2026 16:40:08 +0500
Subject: [PATCH 16/17] added section on Native AOT compatibility

---
 README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/README.md b/README.md
index dfb7b7c0..bcdccdca 100644
--- a/README.md
+++ b/README.md
@@ -169,6 +169,21 @@ public class Item : INotifyPropertyChanged
 
 Build and run your application. You should see the `TableView` populated with the rows and cells from your `ViewModel`.
 
+## Native AOT Compatibility
+
+TableView relies heavily on runtime bindings and dynamic value resolution, which are not fully compatible with IL trimming and Native AOT by default.
+
+To use TableView in Native AOT applications, bound types should be decorated with the `WinRT.GeneratedBindableCustomProperty` attribute to preserve the required binding metadata.
+```cs
+[WinRT.GeneratedBindableCustomProperty]
+public partial class Person
+{
+    public string Name { get; set; }
+
+    public int Age { get; set; }
+}
+```
+
 ## Customization
 
 You can customize the appearance and behavior of the `TableView` by modifying its properties, templates, and styles. For example:

From 66c043eb43f8fec1226287f892a105bd8b3c9c6a Mon Sep 17 00:00:00 2001
From: Waheed Ahmad <waheed.ahmad92@outlook.com>
Date: Tue, 19 May 2026 16:57:30 +0500
Subject: [PATCH 17/17] inverse ShouldApplyFilter condition

---
 src/Controls/TableViewFilterItemsControl.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controls/TableViewFilterItemsControl.xaml.cs b/src/Controls/TableViewFilterItemsControl.xaml.cs
index ed4446b2..834af92a 100644
--- a/src/Controls/TableViewFilterItemsControl.xaml.cs
+++ b/src/Controls/TableViewFilterItemsControl.xaml.cs
@@ -153,7 +153,7 @@ private void OnFilterItemPropertyChanged(object? sender, PropertyChangedEventArg
     /// <summary>
     /// Gets a value indicating whether to apply the filter based on the control state.
     /// </summary>
-    internal bool ShouldApplyFilter => selectAllCheckBox.IsChecked is false || !string.IsNullOrEmpty(searchBox.Text);
+    internal bool ShouldApplyFilter => selectAllCheckBox.IsChecked is not true || !string.IsNullOrEmpty(searchBox.Text);
 
     /// <summary>
     /// Gets or sets the filter items for the control.