improved column filter behavior & UI

Author: w-ahmad

src/WinUI.TableView/TableViewColumnHeader.OptionsFlyoutViewModel.cs

@@ -39,11 +39,20 @@ private void InitializeCommands()
 
             OkCommand.ExecuteRequested += delegate
             {
-                SelectedValues = FilterItems.Where(x => x.IsSelected).Select(x => x.Value).ToList();
-                ColumnHeader.ApplyFilter();
+                ColumnHeader.HideFlyout();
+
+                if (ColumnHeader!._selectAllCheckBox!.IsChecked is true)
+                {
+                    ColumnHeader.ClearFilter();
+                }
+                else
+                {
+                    SelectedValues = FilterItems.Where(x => x.IsSelected).Select(x => x.Value).ToList();
+                    ColumnHeader.ApplyFilter();
+                }
             };
 
-            CancelCommand.ExecuteRequested += delegate { ColumnHeader._optionsFlyout?.Hide(); };
+            CancelCommand.ExecuteRequested += delegate { ColumnHeader.HideFlyout(); };
         }
 
         public TableView TableView { get; }

src/WinUI.TableView/TableViewColumnHeader.cs

@@ -106,12 +106,16 @@ private void ApplyFilter()
             return;
         }
 
-        _optionsFlyout?.Hide();
         _tableView.ActiveFilters[_propertyPath] = Filter;
         _tableView.CollectionView.RefreshFilter();
         IsFiltered = true;
     }
 
+    private void HideFlyout()
+    {
+        _optionsFlyout?.Hide();
+    }
+
     private bool Filter(object item)
     {
         var value = GetValue(item);
@@ -221,10 +225,9 @@ private void PrepareFilterItems(string? _filterText)
             {
                 var value = GetValue(item);
                 value = string.IsNullOrWhiteSpace(value?.ToString()) ? "(Blank)" : value;
-                var isSelected = !string.IsNullOrEmpty(_filterText) ||
+                var isSelected = !isFiltered || !string.IsNullOrEmpty(_filterText) ||
                   (isFiltered && _optionsFlyoutViewModel.SelectedValues.Contains(value));
 
-
                 return string.IsNullOrEmpty(_filterText)
                       || value?.ToString()?.Contains(_filterText, StringComparison.OrdinalIgnoreCase) == true
                       ? new FilterItem(isSelected, value, _optionsFlyoutViewModel)

src/WinUI.TableView/Themes/TableViewColumnHeader.xaml

@@ -195,13 +195,15 @@
                                             <MenuFlyoutItem>
                                                 <MenuFlyoutItem.Template>
                                                     <ControlTemplate TargetType="MenuFlyoutItem">
-                                                        <StackPanel Margin="8,4"
-                                                                    Spacing="16"
-                                                                    HorizontalAlignment="Right"
-                                                                    Orientation="Horizontal">
-                                                            <Button Command="{Binding OkCommand}" />
-                                                            <Button Command="{Binding CancelCommand}" />
-                                                        </StackPanel>
+                                                        <Grid Margin="12,4" 
+                                                              ColumnSpacing="16">
+                                                            <Grid.ColumnDefinitions>
+                                                                <ColumnDefinition Width="*" />
+                                                                <ColumnDefinition Width="*" />
+                                                            </Grid.ColumnDefinitions>
+                                                            <Button Command="{Binding OkCommand}" HorizontalAlignment="Stretch" Style="{StaticResource AccentButtonStyle}" />
+                                                            <Button Command="{Binding CancelCommand}" Grid.Column="1" HorizontalAlignment="Stretch" />
+                                                        </Grid>
                                                     </ControlTemplate>
                                                 </MenuFlyoutItem.Template>
                                             </MenuFlyoutItem>