Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(DataGrid): tabbing doesnt properly bring cell into view, when cell expanded in edit-mode #4984

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(DataGrid): tabbing doesnt properly bring cell into view, when cell expanded in edit-mode #4984

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
50 changes: 50 additions & 0 deletions Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,9 @@ private enum ScrollBarsSeparatorVisualState
private ValidationSummaryItem _selectedValidationSummaryItem;
#endif

private DateTime _scrollAdjustmentTimeWindow = DateTime.MinValue;
private FrameworkElement _scrollAdjustmentTarget;

// An approximation of the sum of the heights in pixels of the scrolling rows preceding
// the first displayed scrolling row. Since the scrolled off rows are discarded, the grid
// does not know their actual height. The heights used for the approximation are the ones
Expand Down Expand Up @@ -5914,6 +5917,49 @@ private void EditingElement_Loaded(object sender, RoutedEventArgs e)
PreparingCellForEditPrivate(element);
}

private void EditingElement_SizeChanged(object sender, SizeChangedEventArgs args)
{
if (sender is not FrameworkElement element)
{
return;
}

if (_scrollAdjustmentTarget != element ||
_scrollAdjustmentTimeWindow < DateTime.Now)
{
element.SizeChanged -= EditingElement_SizeChanged;
return;
}

// Workaround for https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/4983
// Scroll-into-view is based the cell's size in normal mode. For cell that expands in edit-mode,
// the scroll h/v offsets could be off. So we scroll again using with newly updated size.
if (_editingColumnIndex != -1 &&
EditingRow?.Cells[_editingColumnIndex] is { Content: FrameworkElement editor } cell &&
editor == element)
{
var shouldScroll = new
{
Horizontally = args.PreviousSize.Width < args.NewSize.Width,
Vertically = args.PreviousSize.Height < args.NewSize.Height,
};
if (shouldScroll.Horizontally || shouldScroll.Vertically)
{
ComputeScrollBarsLayout();
}

if (shouldScroll.Horizontally)
{
ScrollColumnIntoView(cell.ColumnIndex);
}

if (shouldScroll.Vertically)
{
ScrollSlotIntoView(cell.RowIndex, scrolledHorizontally: false);
}
}
}

private bool EndCellEdit(DataGridEditAction editAction, bool exitEditingMode, bool keepFocus, bool raiseEvents)
{
if (_editingColumnIndex == -1)
Expand Down Expand Up @@ -6700,8 +6746,12 @@ private void NoIndicatorStateStoryboard_Completed(object sender, object e)
element.SetStyleWithType(dataGridBoundColumn.EditingElementStyle);
}

_scrollAdjustmentTimeWindow = DateTime.Now.AddSeconds(.5);
_scrollAdjustmentTarget = element;

// Subscribe to the new element's events
element.Loaded += new RoutedEventHandler(EditingElement_Loaded);
element.SizeChanged += new SizeChangedEventHandler(EditingElement_SizeChanged);
}
}
else
Expand Down