From 43c24388fb1c484166f05a96745a7fea5437010c Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Fri, 10 Sep 2021 13:46:49 -0400
Subject: [PATCH] Merge pull request #6570 from
 workgroupengineering/fixes/Issue_6567

fixes(DataGrid): Issue #6567 New line in Editable DataGrid, Not editable
---
 .../DataGridDataConnection.cs                         | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls.DataGrid/DataGridDataConnection.cs b/src/Avalonia.Controls.DataGrid/DataGridDataConnection.cs
index a94acdec57..fade597ca1 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridDataConnection.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridDataConnection.cs
@@ -233,7 +233,7 @@ namespace Avalonia.Controls
                 else
                 {
                     editableCollectionView.EditItem(dataItem);
-                    return editableCollectionView.IsEditingItem;
+                    return editableCollectionView.IsEditingItem || editableCollectionView.IsAddingNew;
                 }
             }
 
@@ -314,7 +314,14 @@ namespace Avalonia.Controls
                 CommittingEdit = true;
                 try
                 {
-                    editableCollectionView.CommitEdit();
+                    if (editableCollectionView.IsAddingNew)
+                    {
+                        editableCollectionView.CommitNew();
+                    }
+                    else
+                    {
+                        editableCollectionView.CommitEdit();
+                    }                    
                 }
                 finally
                 {