Update Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridComboBoxColumn.cs

michael-hawker · Rosuavio · web-flow · commit 8273bca898fa · 2021-09-02T15:23:11.000-07:00
Co-authored-by: Rosario Pulella &lt;Rosariopulella@gmail.com&gt;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridComboBoxColumn.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridComboBoxColumn.cs
@@ -383,13 +383,13 @@ protected override void CancelCellEdit(FrameworkElement editingElement, object u
         /// <returns>The unedited value. </returns>
         protected override object PrepareCellForEdit(FrameworkElement editingElement, RoutedEventArgs editingEventArgs)
         {
-            var comboBox = editingElement as ComboBox;
-            if (comboBox != null)
+            if(editingElement is ComboBox comboBox)
             {
                 comboBox.IsDropDownOpen = true;
+                return comboBox.SelectedItem;
             }
 
-            return comboBox?.SelectedItem;
+            return null;
         }
 
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -383,13 +383,13 @@ protected override void CancelCellEdit(FrameworkElement editingElement, object u`
`383`	`383`	`/// <returns>The unedited value. </returns>`
`384`	`384`	`protected override object PrepareCellForEdit(FrameworkElement editingElement, RoutedEventArgs editingEventArgs)`
`385`	`385`	`{`
`386`		`- var comboBox = editingElement as ComboBox;`
`387`		`- if (comboBox != null)`
	`386`	`+ if(editingElement is ComboBox comboBox)`
`388`	`387`	`{`
`389`	`388`	`comboBox.IsDropDownOpen = true;`
	`389`	`+ return comboBox.SelectedItem;`
`390`	`390`	`}`
`391`	`391`
`392`		`- return comboBox?.SelectedItem;`
	`392`	`+ return null;`
`393`	`393`	`}`
`394`	`394`
`395`	`395`	`/// <summary>`