Skip to content

Commit dcf7ed0

Browse files
committed
reset filter items scroll on filter flyout opening
1 parent 7badd98 commit dcf7ed0

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

src/TableViewColumnHeader.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public partial class TableViewColumnHeader : ContentControl
4646
private double _reorderStartingPosition;
4747
private bool _reorderStarted;
4848
private RenderTargetBitmap? _dragVisuals;
49+
private ListView? _filterItemsList;
4950

5051
/// <summary>
5152
/// Initializes a new instance of the TableViewColumnHeader class.
@@ -268,6 +269,8 @@ private void OnItemsCheckFlyoutItemLoaded(object sender, RoutedEventArgs e)
268269
// Handle Space key to prevent MenuFlyoutItem performing click action.
269270
menuItem.PreviewKeyUp += static (_, e) => e.Handled = e.Key is VirtualKey.Space;
270271
}
272+
273+
_filterItemsList = menuItem?.FindDescendant<ListView>(x => x.Name is "FilterItemsList");
271274
}
272275

273276
/// <summary>
@@ -327,6 +330,11 @@ private async void OnOptionsFlyoutOpening(object? sender, object e)
327330
await Task.Delay(100);
328331
await FocusManager.TryFocusAsync(_searchBox, FocusState.Programmatic);
329332
}
333+
334+
if (_filterItemsList is not null && _optionsFlyoutViewModel.FilterItems.Count > 0)
335+
{
336+
_filterItemsList.ScrollIntoView(_optionsFlyoutViewModel.FilterItems[0]);
337+
}
330338
}
331339

332340
/// <summary>

0 commit comments

Comments
 (0)