rename project

.github/workflows/cd-build.yml

@@ -21,7 +21,7 @@ jobs:
 
     - name: Build
       run: |
-        msbuild /restore /t:Build,Pack src/WinUI3.TableView/WinUI3.TableView.csproj /p:Configuration=Release /p:PackageVersion=${{ steps.version.outputs.version-without-v }}
+        msbuild /restore /t:Build,Pack src/WinUI.TableView/WinUI.TableView.csproj /p:Configuration=Release /p:PackageVersion=${{ steps.version.outputs.version-without-v }}
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v1

README.md

@@ -1,5 +1,5 @@
-# WinUI3.TableView
-TableView for WinUI3 is derived from ListView and has basic functionalities like editing, column resizing, sorting and multi sorting.
+# WinUI.TableView
+TableView for WinUI is derived from ListView and has basic functionalities like editing, column resizing, sorting and multi sorting.
 
 ## Multi Sorting ![image](https://github.com/w-ahmad/WinUI3.TableView/assets/17172092/52fc3607-daae-4c63-8edb-05269397f53a)
 

src/SampleApp/MainWindow.xaml

@@ -4,7 +4,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:converters="using:CommunityToolkit.WinUI.Converters"
-        xmlns:table="using:WinUI3.TableView"
+        xmlns:table="using:WinUI.TableView"
         mc:Ignorable="d">
 
     <Grid Loaded="OnRootGridLoded"
@@ -31,12 +31,12 @@
                                        Margin="8,0,0,0" />
                         </DataTemplate>
                     </table:TableViewTemplateColumn.CellTemplate>
-                    <!--<table:TableViewTemplateColumn.EditingTemplate>
+                    <table:TableViewTemplateColumn.EditingTemplate>
                         <DataTemplate>
                             <CalendarDatePicker HorizontalAlignment="Stretch" 
                                                 Date="{Binding First_ascent, Mode=TwoWay}" />
                         </DataTemplate>
-                    </table:TableViewTemplateColumn.EditingTemplate>-->
+                    </table:TableViewTemplateColumn.EditingTemplate>
                 </table:TableViewTemplateColumn>
             </table:TableViewColumnsColection>
 

src/SampleApp/SampleApp.csproj

@@ -7,9 +7,8 @@
     <SelfContained>true</SelfContained>
     <WindowsPackageType>None</WindowsPackageType>
   </PropertyGroup>
-
   <ItemGroup>
-    <ProjectReference Include="..\WinUI3.TableView\WinUI3.TableView.csproj" />
+    <ProjectReference Include="..\WinUI.TableView\WinUI.TableView.csproj" />
   </ItemGroup>
 
   <ItemGroup>

src/WinUI3.TableView.sln → src/WinUI.TableView.sln

@@ -3,10 +3,10 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.8.34408.163
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinUI3.TableView", "WinUI3.TableView\WinUI3.TableView.csproj", "{48F8B84A-7C15-4204-A659-23F83B574767}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleApp", "SampleApp\SampleApp.csproj", "{8D3695E5-C1B4-4E36-BAD9-BBD87B283CB0}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinUI.TableView", "WinUI.TableView\WinUI.TableView.csproj", "{0D5C9403-6F03-4EC2-B81C-09F46F8636DA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|arm64 = Debug|arm64
@@ -17,18 +17,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{48F8B84A-7C15-4204-A659-23F83B574767}.Debug|arm64.ActiveCfg = Debug|arm64
-		{48F8B84A-7C15-4204-A659-23F83B574767}.Debug|arm64.Build.0 = Debug|arm64
-		{48F8B84A-7C15-4204-A659-23F83B574767}.Debug|x64.ActiveCfg = Debug|x64
-		{48F8B84A-7C15-4204-A659-23F83B574767}.Debug|x64.Build.0 = Debug|x64
-		{48F8B84A-7C15-4204-A659-23F83B574767}.Debug|x86.ActiveCfg = Debug|x86
-		{48F8B84A-7C15-4204-A659-23F83B574767}.Debug|x86.Build.0 = Debug|x86
-		{48F8B84A-7C15-4204-A659-23F83B574767}.Release|arm64.ActiveCfg = Release|arm64
-		{48F8B84A-7C15-4204-A659-23F83B574767}.Release|arm64.Build.0 = Release|arm64
-		{48F8B84A-7C15-4204-A659-23F83B574767}.Release|x64.ActiveCfg = Release|x64
-		{48F8B84A-7C15-4204-A659-23F83B574767}.Release|x64.Build.0 = Release|x64
-		{48F8B84A-7C15-4204-A659-23F83B574767}.Release|x86.ActiveCfg = Release|x86
-		{48F8B84A-7C15-4204-A659-23F83B574767}.Release|x86.Build.0 = Release|x86
 		{8D3695E5-C1B4-4E36-BAD9-BBD87B283CB0}.Debug|arm64.ActiveCfg = Debug|arm64
 		{8D3695E5-C1B4-4E36-BAD9-BBD87B283CB0}.Debug|arm64.Build.0 = Debug|arm64
 		{8D3695E5-C1B4-4E36-BAD9-BBD87B283CB0}.Debug|x64.ActiveCfg = Debug|x64
@@ -41,6 +29,18 @@ Global
 		{8D3695E5-C1B4-4E36-BAD9-BBD87B283CB0}.Release|x64.Build.0 = Release|x64
 		{8D3695E5-C1B4-4E36-BAD9-BBD87B283CB0}.Release|x86.ActiveCfg = Release|x86
 		{8D3695E5-C1B4-4E36-BAD9-BBD87B283CB0}.Release|x86.Build.0 = Release|x86
+		{0D5C9403-6F03-4EC2-B81C-09F46F8636DA}.Debug|arm64.ActiveCfg = Debug|arm64
+		{0D5C9403-6F03-4EC2-B81C-09F46F8636DA}.Debug|arm64.Build.0 = Debug|arm64
+		{0D5C9403-6F03-4EC2-B81C-09F46F8636DA}.Debug|x64.ActiveCfg = Debug|x64
+		{0D5C9403-6F03-4EC2-B81C-09F46F8636DA}.Debug|x64.Build.0 = Debug|x64
+		{0D5C9403-6F03-4EC2-B81C-09F46F8636DA}.Debug|x86.ActiveCfg = Debug|x86
+		{0D5C9403-6F03-4EC2-B81C-09F46F8636DA}.Debug|x86.Build.0 = Debug|x86
+		{0D5C9403-6F03-4EC2-B81C-09F46F8636DA}.Release|arm64.ActiveCfg = Release|arm64
+		{0D5C9403-6F03-4EC2-B81C-09F46F8636DA}.Release|arm64.Build.0 = Release|arm64
+		{0D5C9403-6F03-4EC2-B81C-09F46F8636DA}.Release|x64.ActiveCfg = Release|x64
+		{0D5C9403-6F03-4EC2-B81C-09F46F8636DA}.Release|x64.Build.0 = Release|x64
+		{0D5C9403-6F03-4EC2-B81C-09F46F8636DA}.Release|x86.ActiveCfg = Release|x86
+		{0D5C9403-6F03-4EC2-B81C-09F46F8636DA}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/WinUI3.TableView/TableView.cs → src/WinUI.TableView/TableView.cs

@@ -3,13 +3,10 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Markup;
 using System.Collections;
-using System.Collections.Specialized;
-using System.Text;
 using System.Threading.Tasks;
 
-namespace WinUI3.TableView;
+namespace WinUI.TableView;
 public class TableView : ListView
 {
     public TableView()

src/WinUI3.TableView/TableViewBoundColumn.cs → src/WinUI.TableView/TableViewBoundColumn.cs

@@ -1,13 +1,13 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Data;
 
-namespace WinUI3.TableView;
+namespace WinUI.TableView;
 
 public abstract class TableViewBoundColumn : TableViewColumn
 {
     private Binding _binding = new();
 
-    public Binding Binding
+    public virtual Binding Binding
     {
         get => _binding;
         set

src/WinUI3.TableView/TableViewCell.cs → src/WinUI.TableView/TableViewCell.cs

@@ -10,7 +10,7 @@
 using Windows.System;
 using Windows.UI.Core;
 
-namespace WinUI3.TableView;
+namespace WinUI.TableView;
 
 public class TableViewCell : ContentControl
 {

src/WinUI3.TableView/TableViewCheckBoxColumn.cs → src/WinUI.TableView/TableViewCheckBoxColumn.cs

@@ -2,7 +2,7 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
 
-namespace WinUI3.TableView;
+namespace WinUI.TableView;
 
 public class TableViewCheckBoxColumn : TableViewBoundColumn
 {

src/WinUI3.TableView/TableViewColumn.cs → src/WinUI.TableView/TableViewColumn.cs

@@ -1,6 +1,6 @@
 using Microsoft.UI.Xaml;
 
-namespace WinUI3.TableView;
+namespace WinUI.TableView;
 
 [StyleTypedProperty(Property = nameof(HeaderStyle), StyleTargetType = typeof(TableViewColumnHeader))]
 public abstract class TableViewColumn : DependencyObject

src/WinUI3.TableView/TableViewColumnHeader.cs → src/WinUI.TableView/TableViewColumnHeader.cs

@@ -10,7 +10,7 @@
 using Windows.UI.Core;
 using SD = CommunityToolkit.WinUI.Collections.SortDirection;
 
-namespace WinUI3.TableView;
+namespace WinUI.TableView;
 
 [TemplateVisualState(Name = VisualStates.StateNormal, GroupName = VisualStates.GroupCommon)]
 [TemplateVisualState(Name = VisualStates.StatePointerOver, GroupName = VisualStates.GroupCommon)]
@@ -25,6 +25,7 @@ public class TableViewColumnHeader : ContentControl
     private bool _canSort;
     private TableViewColumn? _column;
     private TableView? _tableView;
+    private Button? _optionsButton;
 
     public TableViewColumnHeader()
     {
@@ -68,9 +69,16 @@ protected override void OnApplyTemplate()
         base.OnApplyTemplate();
 
         _tableView = this.FindAscendant<TableView>();
+        _optionsButton = GetTemplateChild("PART_OptionsButton") as Button;
         _column = (TableViewColumn)DataContext;
         _column.HeaderControl = this;
         _canSort = _column is TableViewBoundColumn { CanSort: true, Binding.Path.Path.Length: > 0 };
+
+        if (_optionsButton is not null && _column is TableViewBoundColumn)
+        {
+            _optionsButton.Visibility = Visibility.Visible;
+            _optionsButton.Tapped += OnOptionsButtonTaped;
+        }
     }
 
     private void OnOptionsButtonTaped(object sender, TappedRoutedEventArgs e)

src/WinUI3.TableView/TableViewColumnsColection.cs → src/WinUI.TableView/TableViewColumnsColection.cs

@@ -1,5 +1,5 @@
 using System.Collections.ObjectModel;
 
-namespace WinUI3.TableView;
+namespace WinUI.TableView;
 
 public class TableViewColumnsColection : ObservableCollection<TableViewColumn> { }

src/WinUI3.TableView/TableViewComboBoxColumn.cs → src/WinUI.TableView/TableViewComboBoxColumn.cs

@@ -3,7 +3,7 @@
 using Microsoft.UI.Xaml.Controls.Primitives;
 using Microsoft.UI.Xaml.Data;
 
-namespace WinUI3.TableView;
+namespace WinUI.TableView;
 
 public class TableViewComboBoxColumn : TableViewBoundColumn
 {

src/WinUI3.TableView/TableViewHeaderRow.cs → src/WinUI.TableView/TableViewHeaderRow.cs

@@ -2,7 +2,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 
-namespace WinUI3.TableView;
+namespace WinUI.TableView;
 
 public class TableViewHeaderRow : ItemsControl
 {

src/WinUI3.TableView/TableViewNumberColumn.cs → src/WinUI.TableView/TableViewNumberColumn.cs

@@ -1,7 +1,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 
-namespace WinUI3.TableView;
+namespace WinUI.TableView;
 
 public class TableViewNumberColumn : TableViewBoundColumn
 {

src/WinUI3.TableView/TableViewRow.cs → src/WinUI.TableView/TableViewRow.cs

@@ -4,7 +4,7 @@
 using System.Collections.Specialized;
 using System.Linq;
 
-namespace WinUI3.TableView;
+namespace WinUI.TableView;
 
 public class TableViewRow : Control
 {

src/WinUI3.TableView/TableViewTemplateColumn.cs → src/WinUI.TableView/TableViewTemplateColumn.cs

@@ -1,6 +1,6 @@
 using Microsoft.UI.Xaml;
 
-namespace WinUI3.TableView;
+namespace WinUI.TableView;
 
 public class TableViewTemplateColumn : TableViewColumn
 {

src/WinUI3.TableView/TableViewTextColumn.cs → src/WinUI.TableView/TableViewTextColumn.cs

@@ -1,7 +1,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 
-namespace WinUI3.TableView;
+namespace WinUI.TableView;
 
 public class TableViewTextColumn : TableViewBoundColumn
 {

src/WinUI3.TableView/TableViewToggleSwitchColumn.cs → src/WinUI.TableView/TableViewToggleSwitchColumn.cs

@@ -1,7 +1,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 
-namespace WinUI3.TableView;
+namespace WinUI.TableView;
 
 public class TableViewToggleSwitchColumn : TableViewBoundColumn
 {

src/WinUI3.TableView/Themes/Generic.xaml → src/WinUI.TableView/Themes/Generic.xaml

@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
                     xmlns:converters="using:CommunityToolkit.WinUI.Converters"
-                    xmlns:local="using:WinUI3.TableView">
+                    xmlns:local="using:WinUI.TableView">
 
     <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
 
@@ -101,6 +101,32 @@
                                       Visibility="Collapsed"
                                       VerticalAlignment="Top"
                                       Glyph="{ThemeResource SortIconAscending}" />
+
+                            <Button x:Name="PART_OptionsButton"
+                                    Grid.Column="1"
+                                    Padding="4,6,4,4"
+                                    BorderThickness="0"
+                                    Visibility="Collapsed"
+                                    Background="Transparent"
+                                    Opacity="0"
+                                    VerticalAlignment="Bottom">
+                                <FontIcon Grid.Row="1"
+                                          Grid.ColumnSpan="2"
+                                          FontSize="11"
+                                          VerticalAlignment="Center"
+                                          HorizontalAlignment="Right"
+                                          Glyph="{ThemeResource OptionsButtonIcon}" />
+                                <Button.Flyout>
+                                    <Flyout Placement="BottomEdgeAlignedLeft">
+                                        <StackPanel>
+                                            <TextBlock Style="{ThemeResource BaseTextBlockStyle}"
+                                                       Text="All items will be removed. Do you want to continue?"
+                                                       Margin="0,0,0,12" />
+                                            <Button Content="Yes, empty my cart" />
+                                        </StackPanel>
+                                    </Flyout>
+                                </Button.Flyout>
+                            </Button>
                         </Grid>
 
                         <toolkit:ContentSizer Margin="0,0,-4,0"
@@ -338,14 +364,14 @@
 
     <Style TargetType="local:TableViewHeaderRow"
            BasedOn="{StaticResource DefaultTableViewHeaderRowStyle}" />
-    
+
     <Style TargetType="local:TableViewColumnHeader"
            BasedOn="{StaticResource DefaultTableViewColumnHeaderStyle}" />
 
     <Style TargetType="local:TableViewCell"
            BasedOn="{StaticResource DefaultTableViewCellStyle}" />
 
-    <Style TargetType="local:TableViewRow" 
+    <Style TargetType="local:TableViewRow"
            BasedOn="{StaticResource DefaultTableViewRowStyle}" />
 
     <Style TargetType="local:TableView"

src/WinUI3.TableView/VisualStates.cs → src/WinUI.TableView/VisualStates.cs

@@ -2,7 +2,7 @@
 using Microsoft.UI.Xaml.Controls;
 using System.Diagnostics;
 
-namespace WinUI3.TableView;
+namespace WinUI.TableView;
 
 /// <summary>
 /// Names and helpers for visual states in the control.