Merge pull request #12174 from Gundz/12106

Fixed issue where RowDetailsTemplate was getting the wrong DataContext
AvaloniaUI · Jul 28, 2023 · 9808a44 · 9808a44
2 parents e394ca5 + 3fc0d19
commit 9808a44
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/Avalonia.Controls.DataGrid/DataGridRows.cs b/src/Avalonia.Controls.DataGrid/DataGridRows.cs
@@ -2969,11 +2969,8 @@ private void UpdateRowDetailsHeightEstimate()
                 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);