Skip to content

Commit d5a5360

Browse files
authored
Merge pull request #339 from w-ahmad/fix/sort-event-trigger
fix: ensure sort event trigger on sorting
2 parents 3367439 + 76e6b11 commit d5a5360

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/TableViewColumnHeader.cs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,11 @@ private void DoSort(SD? direction, bool singleSorting = true)
9898
{
9999
if (CanSort && Column is not null && _tableView is { CollectionView: CollectionView { } collectionView })
100100
{
101+
var eventArgs = new TableViewSortingEventArgs(Column);
102+
_tableView.OnSorting(eventArgs);
103+
104+
if (eventArgs.Handled) return;
105+
101106
using var defer = collectionView.DeferRefresh();
102107
if (singleSorting)
103108
{
@@ -203,13 +208,7 @@ protected override void OnTapped(TappedRoutedEventArgs e)
203208
var isCtrlButtonDown = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control) is
204209
CoreVirtualKeyStates.Down or (CoreVirtualKeyStates.Down | CoreVirtualKeyStates.Locked);
205210

206-
var eventArgs = new TableViewSortingEventArgs(Column);
207-
_tableView.OnSorting(eventArgs);
208-
209-
if (!eventArgs.Handled)
210-
{
211-
DoSort(GetNextSortDirection(), !isCtrlButtonDown);
212-
}
211+
DoSort(GetNextSortDirection(), !isCtrlButtonDown);
213212
}
214213

215214
base.OnTapped(e);

0 commit comments

Comments
 (0)