Initial commit

kikipoulet · Dec 28, 2024 · b743ea3 · b743ea3
1 parent 1ae5735
commit b743ea3
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 15 deletions.
diff --git a/SukiUI.Demo/Features/ControlsLibrary/CollectionsView.axaml b/SukiUI.Demo/Features/ControlsLibrary/CollectionsView.axaml
@@ -72,15 +72,16 @@
                                           MaxHeight="200"
                                           CanUserResizeColumns="{Binding IsDataGridColumnsResizable}"
                                           ItemsSource="{Binding DataGridContent}">
+                                    <DataGrid.Styles>
+                                        <Style Selector="DataGridRowGroupHeader">
+                                            <Setter Property="IsItemCountVisible" Value="True" />
+                                        </Style>
+                                    </DataGrid.Styles>
                                     <DataGrid.Columns>
-                                        <DataGridTextColumn Binding="{Binding StringColumn}" Header="String" />
-                                        <DataGridTextColumn Binding="{Binding IntColumn}"
-
-                                                            Header="Int" />
-                                        <DataGridCheckBoxColumn Binding="{Binding BoolColumn}"
-
-                                                                Header="Bool" />
-
+                                        <DataGridTextColumn Binding="{Binding StringColumn, DataType=controlsLibrary:DataGridContentViewModel}" Header="String" />
+                                        <DataGridTextColumn Binding="{Binding IntColumn, DataType=controlsLibrary:DataGridContentViewModel}" Header="Int" />
+                                        <DataGridCheckBoxColumn Binding="{Binding BoolColumn, DataType=controlsLibrary:DataGridContentViewModel}" Header="Bool" />
+                                        <DataGridTextColumn Binding="{Binding Group, DataType=controlsLibrary:DataGridContentViewModel}" Header="Group" />
                                     </DataGrid.Columns>
                                 </DataGrid>
                             </showMeTheXaml:XamlDisplay>

diff --git a/SukiUI.Demo/Features/ControlsLibrary/CollectionsViewModel.cs b/SukiUI.Demo/Features/ControlsLibrary/CollectionsViewModel.cs
@@ -10,15 +10,17 @@ namespace SukiUI.Demo.Features.ControlsLibrary;
 public partial class CollectionsViewModel : DemoPageBase
 {
     public AvaloniaList<string> SimpleContent { get; } = [];
-    public AvaloniaList<DataGridContentViewModel> DataGridContent { get; } = [];
+    public DataGridCollectionView DataGridContent { get; }
     public AvaloniaList<Node> TreeViewContent { get; } = [];
     [ObservableProperty] private string _selectedSimpleContent;
     [ObservableProperty] private bool _isDataGridColumnsResizable;
 
     public CollectionsViewModel() : base("Collections", MaterialIconKind.ListBox)
     {
         SimpleContent.AddRange(Enumerable.Range(1, 50).Select(x => $"Option {x}"));
-        DataGridContent.AddRange(Enumerable.Range(1, 50).Select(x => new DataGridContentViewModel(x)));
+        DataGridContent = new DataGridCollectionView(Enumerable.Range(1, 50).Select(x => new DataGridContentViewModel(x)));
+        DataGridContent.GroupDescriptions.Add(new DataGridPathGroupDescription("Group"));
+        //DataGridContent.AddRange(Enumerable.Range(1, 50).Select(x => new DataGridContentViewModel(x)));
         SelectedSimpleContent = SimpleContent.First();
         TreeViewContent.AddRange(
             Enumerable.Range(1, 10).Select(x => new Node($"Outer {x}",
@@ -30,8 +32,9 @@ public CollectionsViewModel() : base("Collections", MaterialIconKind.ListBox)
 public partial class DataGridContentViewModel(int value) : ObservableObject
 {
     [ObservableProperty] private string _stringColumn = $"Content {value}";
-    [ObservableProperty] private int _intColumn = value;
+    [ObservableProperty] [NotifyPropertyChangedFor(nameof(Group))] private int _intColumn = value;
     [ObservableProperty] private bool _boolColumn = Random.Shared.Next(0, 2) == 0;
+    public string Group => IntColumn % 2 == 0 ? "Even" : "Odd";
 }
 
 public partial class Node(string value, IEnumerable<Node>? subNodes = null) : ObservableObject

diff --git a/SukiUI/Theme/DataGridStyle.axaml b/SukiUI/Theme/DataGridStyle.axaml
@@ -221,7 +221,7 @@
     </Style>
 
     <Style Selector="DataGridRowGroupHeader">
-        <Setter Property="Background" Value="{DynamicResource ThemeControlMidHighBrush}" />
+        <Setter Property="Background" Value="Transparent" />
         <Setter Property="Height" Value="20" />
         <Setter Property="Template">
             <ControlTemplate>
@@ -236,6 +236,8 @@
                     <ToggleButton Name="ExpanderButton"
                                   Grid.Row="1"
                                   Grid.Column="2"
+                                  FontWeight="DemiBold"
+                                  Foreground="{DynamicResource SukiText}"
                                   Margin="2,0,0,0" />
 
                     <StackPanel Grid.Row="1"
@@ -245,18 +247,22 @@
                                 Orientation="Horizontal">
                         <TextBlock Name="PropertyNameElement"
                                    Margin="4,0,0,0"
+                                   FontWeight="DemiBold"
                                    IsVisible="{TemplateBinding IsPropertyNameVisible}" />
-                        <TextBlock Margin="4,0,0,0" Text="{Binding Key}" />
+                        <TextBlock Margin="4,0,0,0" 
+                                   FontWeight="DemiBold"
+                                   Text="{Binding Key}" />
                         <TextBlock Name="ItemCountElement"
                                    Margin="4,0,0,0"
+                                   FontWeight="DemiBold"
                                    IsVisible="{TemplateBinding IsItemCountVisible}" />
                     </StackPanel>
 
                     <DataGridRowHeader Name="RowHeader"
                                        Grid.Row="0"
                                        Grid.RowSpan="3"
                                        Grid.Column="0"
-                                       DataGridFrozenGrid.IsFrozen="True" />
+                                       DataGridFrozenGrid.IsFrozen="True"/>
 
                 </DataGridFrozenGrid>
             </ControlTemplate>
@@ -274,7 +280,7 @@
                     <Path HorizontalAlignment="Center"
                           VerticalAlignment="Center"
                           Data="M 0 2 L 4 6 L 0 10 Z"
-                          Fill="Transparent" />
+                          Fill="{DynamicResource SukiText}" />
                 </Border>
             </ControlTemplate>
         </Setter>