rename to SortComparer; null checks

Megabit · Nov 13, 2024 · f01dc58 · f01dc58
1 parent 51f6c4b
commit f01dc58
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/...tion/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridComparerExample.razor b/...tion/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridComparerExample.razor
@@ -8,7 +8,7 @@
           SortMode="DataGridSortMode.Single">
     <DataGridCommandColumn />
     <DataGridColumn Field="@nameof(Employee.Id)" Caption="#" Sortable="false" />
-    <DataGridNumericColumn TItem="Employee" Field="@nameof(Employee.FirstName)" Caption="Full Name" Filterable="false" Comparer="new EmployeeNameComparer()">
+    <DataGridNumericColumn TItem="Employee" Field="@nameof(Employee.FirstName)" Caption="Full Name" Filterable="false" SortComparer="new EmployeeNameComparer()">
         <DisplayTemplate>
             @($"{context.FirstName} {context.LastName}")
         </DisplayTemplate>
@@ -39,9 +39,9 @@
         public override int Compare(Employee x, Employee y)
         {
             // Null checks
-            if (x == null && y == null) return 0;
-            if (x == null) return -1;
-            if (y == null) return 1;
+            if (x is null && y is null) return 0;
+            if (x is null) return -1;
+            if (y is null) return 1;
 
             // Compare by length of FirstName
             int firstNameLengthComparison = x.FirstName.Length.CompareTo(y.FirstName.Length);

diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Features/SortingPage.razor b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Features/SortingPage.razor
@@ -64,9 +64,9 @@
 
 
 <DocsPageSection>
-    <DocsPageSectionHeader Title="Comparer">
+    <DocsPageSectionHeader Title="Sort Comparer">
         <Paragraph>
-            The <code>Comparer</code> feature allows you to define a custom sorting logic for a column by specifying an <code>IComparer&lt;TItem&gt;</code> implementation.
+            The <code>SortComparer</code> feature allows you to define a custom sorting logic for a column by specifying an <code>IComparer&lt;TItem&gt;</code> implementation.
             This is useful when you want to sort data based on complex or calculated criteria that go beyond the default alphabetical or numerical order.
         </Paragraph>
         <Paragraph>
@@ -78,7 +78,7 @@
     <DocsPageSectionContent FullWidth Outlined>
         <DataGridComparerExample />
     </DocsPageSectionContent>
-    <DocsPageSectionSource Code="DataGridComparerExample" />
+    <DocsPageSectionSource Code="DataGridSortComparerExample" />
 </DocsPageSection>
 
 

diff --git a/Source/Extensions/Blazorise.DataGrid/DataGrid.razor.cs b/Source/Extensions/Blazorise.DataGrid/DataGrid.razor.cs
@@ -2301,15 +2301,15 @@ private void FilterData( IQueryable<TItem> query )
                 {
                     if ( sortByColumn.CurrentSortDirection == SortDirection.Ascending )
                     {
-                        query = sortByColumn.Comparer == null
+                        query = sortByColumn.SortComparer == null
                             ? query.OrderBy( x => sortFunction( x ) )
-                            : query.OrderBy( x => x, sortByColumn.Comparer );
+                            : query.OrderBy( x => x, sortByColumn.SortComparer );
                     }
                     else
                     {
-                        query = sortByColumn.Comparer == null
+                        query = sortByColumn.SortComparer == null
                             ? query.OrderByDescending( x => sortFunction( x ) )
-                            : query.OrderByDescending( x => x, sortByColumn.Comparer );
+                            : query.OrderByDescending( x => x, sortByColumn.SortComparer );
                     }
 
                     firstSort = false;
@@ -2318,15 +2318,15 @@ private void FilterData( IQueryable<TItem> query )
                 {
                     if ( sortByColumn.CurrentSortDirection == SortDirection.Ascending )
                     {
-                        query = sortByColumn.Comparer == null
+                        query = sortByColumn.SortComparer is null
                             ? ( query as IOrderedQueryable<TItem> ).ThenBy( x => sortFunction( x ) )
-                            : ( query as IOrderedQueryable<TItem> ).ThenBy( x => x, sortByColumn.Comparer );
+                            : ( query as IOrderedQueryable<TItem> ).ThenBy( x => x, sortByColumn.SortComparer );
                     }
                     else
                     {
-                        query = sortByColumn.Comparer == null
+                        query = sortByColumn.SortComparer is null
                             ? ( query as IOrderedQueryable<TItem> ).ThenByDescending( x => sortFunction( x ) )
-                            : ( query as IOrderedQueryable<TItem> ).ThenByDescending( x => x, sortByColumn.Comparer );
+                            : ( query as IOrderedQueryable<TItem> ).ThenByDescending( x => x, sortByColumn.SortComparer );
                     }
                 }
 

diff --git a/Source/Extensions/Blazorise.DataGrid/DataGridColumn.cs b/Source/Extensions/Blazorise.DataGrid/DataGridColumn.cs
@@ -748,7 +748,7 @@ public SortDirection CurrentSortDirection
     /// <summary>
     /// Gets or sets the custom comparer used for sorting the items in this column.
     /// </summary>
-    [Parameter] public IComparer<TItem> Comparer { get; set; }
+    [Parameter] public IComparer<TItem> SortComparer { get; set; }
 
     /// <summary>
     /// Gets or sets whether the sort direction will be reversed.