Fix DataGridTemplateColumn bug (#2898)

amescodes · web-flow · commit ec81edfc6bcf · 2022-10-06T05:08:23.000Z
Add type check DataGrid columns for DataGridTemplateColumn in DataGridAssist. Fix bug where any controls within a cell of a DataGridTemplateColumn would not respond to the first click
diff --git a/MaterialDesignThemes.Wpf/DataGridAssist.cs b/MaterialDesignThemes.Wpf/DataGridAssist.cs
@@ -233,6 +233,12 @@ private static void AllowDirectEditWithoutFocus(object sender, MouseButtonEventA
         if (dataGridCell.Content is UIElement element)
         {
             var dataGrid = (DataGrid)sender;
+            // If it is a DataGridTemplateColumn we want the
+            // click to be handled naturally by the control
+            if (dataGridCell.Column.GetType() == typeof(DataGridTemplateColumn))
+            {
+                return;
+            }
             if (dataGridCell.IsEditing)
             {
                 // If the cell is already being edited, we don't want to (re)start editing

Original file line number	Diff line number	Diff line change
`@@ -233,6 +233,12 @@ private static void AllowDirectEditWithoutFocus(object sender, MouseButtonEventA`
`233`	`233`	`if (dataGridCell.Content is UIElement element)`
`234`	`234`	`{`
`235`	`235`	`var dataGrid = (DataGrid)sender;`
	`236`	`+ // If it is a DataGridTemplateColumn we want the`
	`237`	`+ // click to be handled naturally by the control`
	`238`	`+ if (dataGridCell.Column.GetType() == typeof(DataGridTemplateColumn))`
	`239`	`+ {`
	`240`	`+ return;`
	`241`	`+ }`
`236`	`242`	`if (dataGridCell.IsEditing)`
`237`	`243`	`{`
`238`	`244`	`// If the cell is already being edited, we don't want to (re)start editing`