Merge pull request #12174 from Gundz/12106

Fixed issue where RowDetailsTemplate was getting the wrong DataContext
3 years ago · 9808a441dc
1 changed files with 1 additions and 4 deletions
--- a/src/Avalonia.Controls.DataGrid/DataGridRows.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridRows.cs
@ -2969,11 +2969,8 @@ namespace Avalonia.Controls
                var detailsContent = RowDetailsTemplate.Build(dataItem);
                if (detailsContent != null)
                {
+                    detailsContent.DataContext = dataItem;
                    _rowsPresenter.Children.Add(detailsContent);
-                    if (dataItem != null)
-                    {
-                        detailsContent.DataContext = dataItem;
-                    }
                    detailsContent.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
                    RowDetailsHeightEstimate = detailsContent.DesiredSize.Height;
                    _rowsPresenter.Children.Remove(detailsContent);