Merge 'origin/main' into 'perf/optimize_sort_filter_ops'

Author: w-ahmad

src/Columns/TableViewColumn.cs

@@ -455,6 +455,20 @@ private static void OnHeaderStyleChanged(DependencyObject d, DependencyPropertyC
         }
     }
 
+    /// <summary>
+    /// Gets or sets the member path to use for sorting instead of the default binding path.
+    /// </summary>
+    public string? SortMemberPath
+    {
+        get => (string?)GetValue(SortMemberPathProperty);
+        set => SetValue(SortMemberPathProperty, value);
+    }
+
+    /// <summary>
+    /// Identifies the SortMemberPath dependency property.
+    /// </summary>
+    public static readonly DependencyProperty SortMemberPathProperty = DependencyProperty.Register(nameof(SortMemberPath), typeof(string), typeof(TableViewColumn), new PropertyMetadata(null));
+
     /// <summary>
     /// Identifies the HeaderStyle dependency property.
     /// </summary>

src/ItemsSource/ColumnSortDescription.cs

@@ -21,6 +21,11 @@ public ColumnSortDescription(TableViewColumn column,
 
     public override object? GetPropertyValue(object? item)
     {
+        // Use reflection-based property access when SortMemberPath is explicitly provided; otherwise, fall back to column cell content.
+        if (!string.IsNullOrEmpty(PropertyName))
+        {
+            return base.GetPropertyValue(item);
+        }
         return Column.GetCellContent(item);
     }
 

src/TableView.cs

@@ -56,6 +56,7 @@ public TableView()
         RegisterPropertyChangedCallback(ListViewBase.SelectionModeProperty, OnBaseSelectionModeChanged);
 
         Loaded += OnLoaded;
+        Unloaded += OnUnloaded;
         SelectionChanged += TableView_SelectionChanged;
         _collectionView.ItemPropertyChanged += OnItemPropertyChanged;
     }
@@ -319,6 +320,17 @@ private void OnLoaded(object sender, RoutedEventArgs e)
         EnsureAutoColumns();
     }
 
+    /// <summary>
+    /// Handles the Unloaded event of the TableView control.
+    /// </summary>
+    private void OnUnloaded(object sender, RoutedEventArgs e)
+    {
+        if (IsEditing && CurrentCellSlot.HasValue && GetCellFromSlot(CurrentCellSlot.Value) is { } currentCell)
+        {
+            currentCell.EndEditing(TableViewEditAction.Commit);
+        }
+    }
+
     /// <summary>
     /// Handles the PointerWheelChanged event of the ScrollContentPresenter.
     /// </summary>

src/TableViewColumnHeader.cs

@@ -112,8 +112,12 @@ private void DoSort(SD? direction, bool singleSorting = true)
             {
                 var boundColumn = Column as TableViewBoundColumn;
                 Column.SortDirection = direction;
+
+                // Prefer explicit SortMemberPath if provided, otherwise use bound column's property path
+                var sortPath = Column.SortMemberPath ?? boundColumn?.PropertyPath;
+
                 _tableView.SortDescriptions.Add(
-                    new ColumnSortDescription(Column!, boundColumn?.PropertyPath, direction.Value));
+                    new ColumnSortDescription(Column!, sortPath, direction.Value));
             }
         }
     }