[pull] main from w-ahmad:main

src/ColumnFilterHandler.cs

@@ -144,10 +144,7 @@ public virtual void ClearFilter(TableViewColumn? column)
 
             foreach (var col in _tableView.Columns)
             {
-                if (col is not null)
-                {
-                    col.IsFiltered = false;
-                }
+                col?.IsFiltered = false;
             }
         }
     }

src/Columns/TableViewBoundColumn.cs

@@ -8,8 +8,6 @@ namespace WinUI.TableView;
 /// </summary>
 public abstract class TableViewBoundColumn : TableViewColumn
 {
-    private Binding _binding = new();
-
     /// <summary>
     /// Gets the property path for the binding.
     /// </summary>
@@ -20,10 +18,10 @@ public abstract class TableViewBoundColumn : TableViewColumn
     /// </summary>
     public virtual Binding Binding
     {
-        get => _binding;
+        get;
         set
         {
-            if (_binding != value)
+            if (field != value)
             {
                 if (value is not null)
                 {
@@ -35,10 +33,10 @@ public virtual Binding Binding
                     }
                 }
 
-                _binding = value!;
+                field = value!;
             }
         }
-    }
+    } = new();
 
     /// <summary>
     /// Gets or sets the optional data binding used to perform operations on cell content, for example sorting, filtering and exporting.

src/Columns/TableViewColumn.cs

@@ -14,14 +14,8 @@ namespace WinUI.TableView;
 [StyleTypedProperty(Property = nameof(CellStyle), StyleTargetType = typeof(TableViewCell))]
 public abstract partial class TableViewColumn : DependencyObject
 {
-    private TableViewColumnHeader? _headerControl;
-    private double _desiredWidth;
-    private SD? _sortDirection;
-    private bool _isFiltered;
-    private bool _isFrozen;
     private Func<object, object?>? _funcCompiledPropertyPath;
     private Func<object, object?>? _funcCompiledClipboardPropertyPath;
-    private Binding? _clipboardContentBinding;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="TableViewColumn"/> class with default conditional cell styles.
@@ -244,11 +238,14 @@ public Style CellStyle
     /// </summary>
     public TableViewColumnHeader? HeaderControl
     {
-        get => _headerControl;
+        get;
         internal set
         {
-            _headerControl = value;
-            EnsureHeaderStyle();
+            if (field != value)
+            {
+                field = value;
+                EnsureHeaderStyle();
+            }
         }
     }
 
@@ -322,12 +319,12 @@ public IList<TableViewConditionalCellStyle> ConditionalCellStyles
     /// </summary>
     internal double DesiredWidth
     {
-        get => _desiredWidth;
+        get;
         set
         {
-            if (_desiredWidth != value)
+            if (field != value)
             {
-                _desiredWidth = value;
+                field = value;
                 OwningCollection?.HandleColumnPropertyChanged(this, nameof(DesiredWidth));
             }
         }
@@ -348,11 +345,14 @@ internal double DesiredWidth
     /// </summary>
     public SD? SortDirection
     {
-        get => _sortDirection;
+        get;
         set
         {
-            _sortDirection = value;
-            OnSortDirectionChanged();
+            if (field != value)
+            {
+                field = value;
+                OnSortDirectionChanged();
+            }
         }
     }
 
@@ -361,11 +361,14 @@ public SD? SortDirection
     /// </summary>
     public bool IsFiltered
     {
-        get => _isFiltered;
+        get;
         set
         {
-            _isFiltered = value;
-            OnIsFilteredChanged();
+            if (field != value)
+            {
+                field = value;
+                OnIsFilteredChanged();
+            }
         }
     }
 
@@ -374,12 +377,12 @@ public bool IsFiltered
     /// </summary>
     public bool IsFrozen
     {
-        get => _isFrozen;
+        get;
         internal set
         {
-            if (_isFrozen != value)
+            if (field != value)
             {
-                _isFrozen = value;
+                field = value;
                 OwningCollection?.HandleColumnPropertyChanged(this, nameof(IsFrozen));
             }
         }
@@ -401,8 +404,8 @@ internal set
     /// </summary>
     public Binding? ClipboardContentBinding
     {
-        get => _clipboardContentBinding ?? OperationContentBinding;
-        set => _clipboardContentBinding = value;
+        get => field ?? OperationContentBinding;
+        set;
     }
 
     /// <summary>
@@ -436,10 +439,7 @@ private void OnIsFilteredChanged()
     /// </summary>
     internal void EnsureHeaderStyle()
     {
-        if (_headerControl is not null)
-        {
-            _headerControl.Style = HeaderStyle ?? TableView?.ColumnHeaderStyle;
-        }
+        HeaderControl?.Style = HeaderStyle ?? TableView?.ColumnHeaderStyle;
     }
 
     /// <summary>

src/Columns/TableViewComboBoxColumn.cs

@@ -15,9 +15,6 @@ namespace WinUI.TableView;
 #endif
 public partial class TableViewComboBoxColumn : TableViewBoundColumn
 {
-    private Binding? _textBinding;
-    private Binding? _selectedValueBinding;
-
     /// <summary>
     /// Generates a TextBlock element for the cell.
     /// </summary>
@@ -135,32 +132,26 @@ public bool IsEditable
     /// <summary>
     /// Gets or sets the binding for the text property of the ComboBox.
     /// </summary>
-    public virtual Binding TextBinding
+    public virtual Binding? TextBinding
     {
-        get => _textBinding!;
+        get;
         set
         {
-            _textBinding = value;
-            if (_textBinding is not null)
-            {
-                _textBinding.Mode = BindingMode.TwoWay;
-            }
+            field = value;
+            field?.Mode = BindingMode.TwoWay;
         }
     }
 
     /// <summary>
     /// Gets or sets the binding for the selected value property of the ComboBox.
     /// </summary>
-    public virtual Binding SelectedValueBinding
+    public virtual Binding? SelectedValueBinding
     {
-        get => _selectedValueBinding!;
+        get;
         set
         {
-            _selectedValueBinding = value;
-            if (_selectedValueBinding is not null)
-            {
-                _selectedValueBinding.Mode = BindingMode.TwoWay;
-            }
+            field = value;
+            field?.Mode = BindingMode.TwoWay;
         }
     }
 

src/Controls/TableViewFilterItemsControl.xaml.cs

@@ -16,7 +16,6 @@ namespace WinUI.TableView.Controls;
 public partial class TableViewFilterItemsControl : UserControl
 {
     private bool _canSetState = true;
-    private ICollection<TableViewFilterItem>? _filterItems;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="TableViewFilterItemsControl"/> class.
@@ -93,8 +92,8 @@ internal void SetSelectAllCheckBoxState()
         }
 
 
-        selectAllCheckBox.IsChecked = _filterItems?.All(x => x.IsSelected) ?? false ? true
-                                      : _filterItems?.All(x => !x.IsSelected) ?? false ? false
+        selectAllCheckBox.IsChecked = FilterItems?.All(x => x.IsSelected) ?? false ? true
+                                      : FilterItems?.All(x => !x.IsSelected) ?? false ? false
                                       : null;
     }
 
@@ -119,9 +118,9 @@ internal void SetFilterItemsState(bool isSelected)
     /// </summary>
     private void AttachPropertyChangedHandlers()
     {
-        if (_filterItems?.Count > 0)
+        if (FilterItems?.Count > 0)
         {
-            foreach (var item in _filterItems)
+            foreach (var item in FilterItems)
             {
                 item.PropertyChanged += OnFilterItemPropertyChanged;
             }
@@ -133,9 +132,9 @@ private void AttachPropertyChangedHandlers()
     /// </summary>
     private void DetachPropertyChangedHandlers()
     {
-        if (_filterItems?.Count > 0)
+        if (FilterItems?.Count > 0)
         {
-            foreach (var item in _filterItems)
+            foreach (var item in FilterItems)
             {
                 item.PropertyChanged -= OnFilterItemPropertyChanged;
             }
@@ -160,14 +159,14 @@ private void OnFilterItemPropertyChanged(object? sender, PropertyChangedEventArg
     /// </summary>
     internal ICollection<TableViewFilterItem>? FilterItems
     {
-        get => _filterItems;
+        get;
         set
         {
-            if (_filterItems == value) return;
+            if (field == value) return;
 
             DetachPropertyChangedHandlers();
-            _filterItems = value;
-            filterItemsList.ItemsSource = _filterItems;
+            field = value;
+            filterItemsList.ItemsSource = field;
             AttachPropertyChangedHandlers();
             SetSelectAllCheckBoxState();
         }

src/ItemsSource/CollectionView.Properties.cs

@@ -13,25 +13,25 @@ partial class CollectionView
     /// </summary>
     public IEnumerable Source
     {
-        get => _source;
+        get;
         set
         {
-            if (_source == value) return;
+            if (field == value) return;
 
-            DetachCollectionChangedHandlers(_source);
-            DetachPropertyChangedHandlers(_source);
+            DetachCollectionChangedHandlers(field);
+            DetachPropertyChangedHandlers(field);
 
-            _source = value;
+            field = value;
 
-            AttachCollectionChangedHandlers(_source);
-            AttachPropertyChangedHandlers(_source);
+            AttachCollectionChangedHandlers(field);
+            AttachPropertyChangedHandlers(field);
 
-            CreateItemsCopy(_source);
+            CreateItemsCopy(field);
 
             HandleSourceChanged();
             OnPropertyChanged();
         }
-    }
+    } = new List<object>();
 
     /// <summary>
     /// Gets a value indicating whether this CollectionView can filter its items.
@@ -81,7 +81,7 @@ public object? CurrentItem
     /// <summary>
     /// Gets a value indicating whether there are more items to load.
     /// </summary>
-    public bool HasMoreItems => (_source as ISupportIncrementalLoading)?.HasMoreItems ?? false;
+    public bool HasMoreItems => (Source as ISupportIncrementalLoading)?.HasMoreItems ?? false;
 
     /// <summary>
     /// Gets a value indicating whether the current item is after the last item in the view.
@@ -101,23 +101,23 @@ public object? CurrentItem
     /// <summary>
     /// Gets a value indicating whether the collection is read-only.
     /// </summary>
-    public bool IsReadOnly => _source == null || _source.IsReadOnly();
+    public bool IsReadOnly => Source == null || Source.IsReadOnly();
 
     /// <summary>
     /// Gets or sets a value indicating whether live shaping is enabled.
     /// </summary>
     public bool AllowLiveShaping
     {
-        get => _allowLiveShaping;
+        get;
         set
         {
-            if (_allowLiveShaping == value) return;
+            if (field == value) return;
 
-            _allowLiveShaping = value;
-            if (_allowLiveShaping)
-                AttachPropertyChangedHandlers(_source);
+            field = value;
+            if (field)
+                AttachPropertyChangedHandlers(Source);
             else
-                DetachPropertyChangedHandlers(_source);
+                DetachPropertyChangedHandlers(Source);
         }
     }
 }