Skip to content

End editing on PointerPress #357

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

Open
Mangepange wants to merge 1 commit into
base: main
Choose a base branch
from
+35 −20
Open

End editing on PointerPress #357

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/TableView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
}

/// <inheritdoc/>
protected override async void OnKeyDown(KeyRoutedEventArgs e)
protected override void OnKeyDown(KeyRoutedEventArgs e)
{
var shiftKey = KeyboardHelper.IsShiftKeyDown();
var ctrlKey = KeyboardHelper.IsCtrlKeyDown();
Expand All @@ -144,19 +144,19 @@
return;
}

await HandleNavigations(e, shiftKey, ctrlKey);
HandleNavigations(e, shiftKey, ctrlKey);
}

/// <summary>
/// Handles navigation keys.
/// </summary>
private async Task HandleNavigations(KeyRoutedEventArgs e, bool shiftKey, bool ctrlKey)
private void HandleNavigations(KeyRoutedEventArgs e, bool shiftKey, bool ctrlKey)
{
var currentCell = CurrentCellSlot.HasValue ? GetCellFromSlot(CurrentCellSlot.Value) : default;

if (e.Key is VirtualKey.F2 && currentCell is { IsReadOnly: false } && !IsEditing)
{
e.Handled = await currentCell.BeginCellEditing(e);
e.Handled = currentCell.BeginCellEditing(e);
}
else if (e.Key is VirtualKey.Escape && currentCell is not null && IsEditing)
{
Expand Down Expand Up @@ -192,7 +192,7 @@
{
if (!EndCellEditing(TableViewEditAction.Commit, currentCell)) return;

if (CurrentCellSlot == newSlot || GetCellFromSlot(newSlot) is not { } nextCell || !await nextCell.BeginCellEditing(e))
if (CurrentCellSlot == newSlot || GetCellFromSlot(newSlot) is not { } nextCell || !nextCell.BeginCellEditing(e))
{
SetIsEditing(false);
}
Expand Down Expand Up @@ -283,7 +283,7 @@
_scrollViewer = GetTemplateChild("ScrollViewer") as ScrollViewer;
_headerRowDefinition = GetTemplateChild("HeaderRowDefinition") as RowDefinition;
if (_scrollViewer is not null) _scrollViewer.Loaded += OnScrollViewerLoaded;

if (IsLoaded)
{
while (ItemsPanelRoot is null) await Task.Yield();
Expand Down Expand Up @@ -320,12 +320,12 @@
Source = this
});
}

/// <summary>
/// Handles the Loaded event of the TableView control.
/// </summary>
private void OnLoaded(object sender, RoutedEventArgs e)
{
{
EnsureAutoColumns();
}

Expand Down Expand Up @@ -597,7 +597,7 @@
}
else
{
foreach (var propertyInfo in dataType.GetProperties())

Check warning on line 600 in src/TableView.cs

View workflow job for this annotation

GitHub Actions / build 

'this' argument does not satisfy 'DynamicallyAccessedMemberTypes.PublicProperties' in call to 'System.Type.GetProperties()'. The return value of method 'WinUI.TableView.Extensions.ObjectExtensions.GetItemType(IEnumerable)' does not have matching annotations. The source value must declare at least the same requirements as those declared on the target location it is assigned to.
{
var displayAttribute = propertyInfo.GetCustomAttributes().OfType<DisplayAttribute>().FirstOrDefault();
var autoGenerateField = displayAttribute?.GetAutoGenerateField();
Expand Down
39 changes: 27 additions & 12 deletions src/TableViewCell.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,18 +210,14 @@ protected override void OnPointerExited(PointerRoutedEventArgs e)
}

/// <inheritdoc/>
protected override async void OnTapped(TappedRoutedEventArgs e)
protected override void OnTapped(TappedRoutedEventArgs e)
{
base.OnTapped(e);

if ((TableView?.IsEditing ?? false) &&
TableView.CurrentCellSlot != Slot &&
TableView.CurrentCellSlot.HasValue &&
TableView.GetCellFromSlot(TableView.CurrentCellSlot.Value) is { } currentCell)
if (TryEndCurrentCellEdit())
{
e.Handled = !TableView.EndCellEditing(TableViewEditAction.Commit, currentCell);

if (e.Handled) return;
e.Handled = true;
return;
}

if (TableView?.CurrentCellSlot != Slot || TableView?.LastSelectionUnit is TableViewSelectionUnit.Row)
Expand All @@ -236,9 +232,15 @@ protected override void OnPointerPressed(PointerRoutedEventArgs e)
{
base.OnPointerPressed(e);

if (TryEndCurrentCellEdit())
{
e.Handled = true;
return;
}

if (!KeyboardHelper.IsShiftKeyDown() && TableView is not null)
{
TableView.SelectionStartCellSlot = TableView.SelectionUnit is not TableViewSelectionUnit.Row || !IsReadOnly ? Slot : default; ;
TableView.SelectionStartCellSlot = TableView.SelectionUnit is not TableViewSelectionUnit.Row || !IsReadOnly ? Slot : default;
TableView.SelectionStartRowIndex = Index;
CapturePointer(e.Pointer);
}
Expand Down Expand Up @@ -278,6 +280,19 @@ protected override void OnManipulationDelta(ManipulationDeltaRoutedEventArgs e)
}
}

private bool TryEndCurrentCellEdit()
{
if ((TableView?.IsEditing ?? false) &&
TableView.CurrentCellSlot != Slot &&
TableView.CurrentCellSlot.HasValue &&
TableView.GetCellFromSlot(TableView.CurrentCellSlot.Value) is { } currentCell)
{
return !TableView.EndCellEditing(TableViewEditAction.Commit, currentCell);
}

return false;
}

/// <summary>
/// Gets the height of the horizontal gridlines/>.
/// </summary>
Expand Down Expand Up @@ -309,7 +324,7 @@ private double GetHorizontalGridlineHeight()
}

/// <inheritdoc/>
protected override async void OnDoubleTapped(DoubleTappedRoutedEventArgs e)
protected override void OnDoubleTapped(DoubleTappedRoutedEventArgs e)
{
var eventArgs = new TableViewCellDoubleTappedEventArgs(Slot, this, Row?.Content);
TableView?.OnCellDoubleTapped(eventArgs);
Expand All @@ -321,7 +336,7 @@ protected override async void OnDoubleTapped(DoubleTappedRoutedEventArgs e)

if (!IsReadOnly && TableView is not null && !TableView.IsEditing && !Column?.UseSingleElement is true)
{
e.Handled = await BeginCellEditing(e);
e.Handled = BeginCellEditing(e);
}
else
{
Expand Down Expand Up @@ -370,7 +385,7 @@ private void MakeSelection()
/// <param name="editingArgs">The event data associated with the editing request. Cannot be null.</param>
/// <returns>A task that represents the asynchronous operation. The task result is <see langword="true"/> if cell editing was
/// successfully started; otherwise, <see langword="false"/> if the operation was canceled.</returns>
internal async Task<bool> BeginCellEditing(RoutedEventArgs editingArgs)
internal bool BeginCellEditing(RoutedEventArgs editingArgs)
{
var args = new TableViewBeginningEditEventArgs(this, Row?.Content, Column!, editingArgs);
TableView?.OnBeginningEdit(args);
Expand Down
Loading