From 22ef68e43960f57368c593ca31841fe90c9f4f3a Mon Sep 17 00:00:00 2001
From: Gundlack Florian <florian.gundlack@chyronhego.com>
Date: Thu, 13 Jul 2023 13:45:16 +0200
Subject: [PATCH] Fixed issue where RowDetailsTemplate was getting the wrong
 DataContext

---
 src/Avalonia.Controls.DataGrid/DataGridRows.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Avalonia.Controls.DataGrid/DataGridRows.cs b/src/Avalonia.Controls.DataGrid/DataGridRows.cs
index 44079d24d0..107a2a7353 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridRows.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridRows.cs
@@ -2970,10 +2970,7 @@ namespace Avalonia.Controls
                 if (detailsContent != null)
                 {
                     _rowsPresenter.Children.Add(detailsContent);
-                    if (dataItem != null)
-                    {
-                        detailsContent.DataContext = dataItem;
-                    }
+                    detailsContent.DataContext = dataItem;
                     detailsContent.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
                     RowDetailsHeightEstimate = detailsContent.DesiredSize.Height;
                     _rowsPresenter.Children.Remove(detailsContent);