fixed an issue with get cels content process

w-ahmad · Jun 17, 2024 · e388865 · e388865
1 parent ee12d83
commit e388865
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/WinUI.TableView/TableView.cs b/src/WinUI.TableView/TableView.cs
@@ -262,6 +262,7 @@ public string GetSelectedContent(bool includeHeaders, char separator = '\t')
             slots = SelectedRanges.SelectMany(x => Enumerable.Range(x.FirstIndex, (int)x.Length))
                                   .SelectMany(r => Enumerable.Range(0, Columns.VisibleColumns.Count)
                                                                      .Select(c => new TableViewCellSlot(r, c)))
+                                  .Concat(SelectedCells)
                                   .OrderBy(x => x.Row)
                                   .ThenByDescending(x => x.Column);
         }
@@ -278,7 +279,6 @@ public string GetAllContent(bool includeHeaders, char separator = '\t')
         var slots = Enumerable.Range(0, Items.Count)
                               .SelectMany(r => Enumerable.Range(0, Columns.VisibleColumns.Count)
                                                                  .Select(c => new TableViewCellSlot(r, c)))
-                              .Concat(SelectedCells)
                               .OrderBy(x => x.Row)
                               .ThenByDescending(x => x.Column);
 
@@ -287,6 +287,11 @@ public string GetAllContent(bool includeHeaders, char separator = '\t')
 
     private string GetCellsContent(IEnumerable<TableViewCellSlot> slots, bool includeHeaders, char separator)
     {
+        if (!slots.Any())
+        {
+            return string.Empty;
+        }
+
         var minRow = slots.Select(x => x.Row).Min();
         var maxRow = slots.Select(x => x.Row).Max();
         var minColumn = slots.Select(x => x.Column).Min();