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

fixes(DataGrid): Issue #6567 New line in Editable DataGrid, Not editable #6570

Merged
merged 2 commits into from
Sep 10, 2021
Merged

fixes(DataGrid): Issue #6567 New line in Editable DataGrid, Not editable #6570

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c919109
fixes(DataGrid): Issue #6567 New line in Editable DataGrid, Not editable
workgroupengineering Sep 10, 2021
fc5da01
Merge branch 'master' into fixes/Issue_6567
maxkatz6 Sep 10, 2021
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
11 changes: 9 additions & 2 deletions src/Avalonia.Controls.DataGrid/DataGridDataConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ public bool BeginEdit(object dataItem)
else
{
editableCollectionView.EditItem(dataItem);
return editableCollectionView.IsEditingItem;
return editableCollectionView.IsEditingItem || editableCollectionView.IsAddingNew;
}
}

Expand Down Expand Up @@ -314,7 +314,14 @@ public bool EndEdit(object dataItem)
CommittingEdit = true;
try
{
editableCollectionView.CommitEdit();
if (editableCollectionView.IsAddingNew)
{
editableCollectionView.CommitNew();
}
else
{
editableCollectionView.CommitEdit();
}
}
finally
{
Expand Down