Merge pull request #74 from anmcgrath/fix-before-sort-options-null

Fix sort options in the BeforeRangeSort not being the same as those u…
anmcgrath · Jun 2, 2024 · 7783b8d · 7783b8d
2 parents bc4e9a0 + aaba087
commit 7783b8d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/src/BlazorDatasheet.Core/Commands/SortRangeCommand.cs b/src/BlazorDatasheet.Core/Commands/SortRangeCommand.cs
@@ -20,11 +20,10 @@ public class SortRangeCommand : IUndoableCommand
     /// <param name="region">The region to sort</param>
     /// <param name="sortOptions">The column sort options, if null the default sort (sort on column 0 ascending) will be used.
     /// If two column values are equal, then the next option will be used for the sort, equivalent to a ThenBy</param>
-    public SortRangeCommand(IRegion region, List<ColumnSortOptions>? sortOptions = null)
+    public SortRangeCommand(IRegion region, List<ColumnSortOptions> sortOptions = null)
     {
         _region = region;
-        _sortOptions = sortOptions ?? new List<ColumnSortOptions>()
-            { new(0, true) };
+        _sortOptions = sortOptions;
     }
 
     /// <summary>

diff --git a/src/BlazorDatasheet.Core/Data/Sheet.cs b/src/BlazorDatasheet.Core/Data/Sheet.cs
@@ -310,6 +310,9 @@ public void SortRange(IRegion? region, List<ColumnSortOptions>? sortOptions = nu
     {
         if (region == null)
             return;
+
+        sortOptions ??= [new ColumnSortOptions(0, true)];
+
         var beforeArgs = new BeforeRangeSortEventArgs(region, sortOptions);
         BeforeRangeSort?.Invoke(this, beforeArgs);
         var cmd = new SortRangeCommand(region, sortOptions);

diff --git a/src/BlazorDatasheet.Core/Events/BeforeRangeSortEventArgs.cs b/src/BlazorDatasheet.Core/Events/BeforeRangeSortEventArgs.cs
@@ -7,9 +7,9 @@ namespace BlazorDatasheet.Core.Events;
 public class BeforeRangeSortEventArgs : CancelEventArgs
 {
     public IRegion Region { get; }
-    public IList<ColumnSortOptions>? SortOptions { get; }
+    public IList<ColumnSortOptions> SortOptions { get; }
 
-    public BeforeRangeSortEventArgs(IRegion region, IList<ColumnSortOptions>? sortOptions)
+    public BeforeRangeSortEventArgs(IRegion region, IList<ColumnSortOptions> sortOptions)
     {
         Region = region;
         SortOptions = sortOptions;

diff --git a/test/BlazorDatasheet.Test/SheetTests/SheetTests.cs b/test/BlazorDatasheet.Test/SheetTests/SheetTests.cs
@@ -141,6 +141,7 @@ public void Cancel_Before_Range_Sort_Cancels_Sorting()
         sheet.BeforeRangeSort += (sender, args) =>
         {
             args.Cancel = true;
+            args.SortOptions.Should().NotBeNull();
         };
 
         sheet.SortRange(new ColumnRegion(0));