Changing DataGridItemAutomationPeer::GetNameCore & fixing DATAGRIDROWHEADER_stateNormalEditingRowFocused

RBrid · RBrid · commit 2ca1aaf5948f · 2020-06-25T17:18:46.000-07:00
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridAutomationPeer.cs
@@ -184,7 +184,11 @@ protected override IList<AutomationPeer> GetChildrenCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            Debug.WriteLine("DataGridAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
@@ -212,6 +216,10 @@ protected override string GetNameCore()
                 }
             }
 
+#if DEBUG_AUTOMATION
+            Debug.WriteLine("DataGridAutomationPeer.GetNameCore returns " + name);
+#endif
+
             return name;
         }
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridCellAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridCellAutomationPeer.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+// #define DEBUG_AUTOMATION
 using System.Collections.Generic;
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.Toolkit.Uwp.UI.Controls.DataGridInternals;
@@ -107,7 +108,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridCellAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridColumnHeaderAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridColumnHeaderAutomationPeer.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+// #define DEBUG_AUTOMATION
 using System.ComponentModel;
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.Toolkit.Uwp.UI.Controls.DataGridInternals;
@@ -50,7 +51,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridColumnHeaderAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridColumnHeadersPresenterAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridColumnHeadersPresenterAutomationPeer.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+// #define DEBUG_AUTOMATION
 using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Windows.UI.Xaml.Automation.Peers;
 
@@ -37,7 +38,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridColumnHeadersPresenterAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridDetailsPresenterAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridDetailsPresenterAutomationPeer.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+// #define DEBUG_AUTOMATION
 using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Windows.UI.Xaml.Automation.Peers;
 
@@ -37,7 +38,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return this.Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridDetailsPresenterAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridGroupItemAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridGroupItemAutomationPeer.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+// #define DEBUG_AUTOMATION
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -200,7 +201,11 @@ protected override IList<AutomationPeer> GetChildrenCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return this.OwningRowGroupHeaderPeer != null ? this.OwningRowGroupHeaderPeer.GetClassName() : string.Empty;
+            string classNameCore = this.OwningRowGroupHeaderPeer != null ? this.OwningRowGroupHeaderPeer.GetClassName() : string.Empty;
+#if DEBUG_AUTOMATION
+            Debug.WriteLine("DataGridGroupItemAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridItemAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridItemAutomationPeer.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+// #define DEBUG_AUTOMATION
 using System;
 using System.Collections.Generic;
 using Microsoft.Toolkit.Uwp.UI.Controls;
@@ -151,7 +152,11 @@ protected override IList<AutomationPeer> GetChildrenCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return (this.OwningRowPeer != null) ? this.OwningRowPeer.GetClassName() : string.Empty;
+            string classNameCore = (this.OwningRowPeer != null) ? this.OwningRowPeer.GetClassName() : string.Empty;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridItemAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
@@ -219,11 +224,18 @@ protected override string GetNameCore()
                 string owningRowPeerName = this.OwningRowPeer.GetName();
                 if (!string.IsNullOrEmpty(owningRowPeerName))
                 {
+#if DEBUG_AUTOMATION
+                    System.Diagnostics.Debug.WriteLine("DataGridItemAutomationPeer.GetNameCore returns " + owningRowPeerName);
+#endif
                     return owningRowPeerName;
                 }
             }
 
-            return string.Empty;
+            string name = UI.Controls.Properties.Resources.DataGridRowAutomationPeer_ItemType;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridItemAutomationPeer.GetNameCore returns " + name);
+#endif
+            return name;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowAutomationPeer.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+// #define DEBUG_AUTOMATION
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Windows.UI.Xaml.Automation.Peers;
 
@@ -37,7 +38,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridRowAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowGroupHeaderAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowGroupHeaderAutomationPeer.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+// #define DEBUG_AUTOMATION
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Windows.UI.Xaml.Automation.Peers;
 
@@ -37,7 +38,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridRowGroupHeaderAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowHeaderAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowHeaderAutomationPeer.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+// #define DEBUG_AUTOMATION
 using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Windows.UI.Xaml.Automation.Peers;
 
@@ -45,7 +46,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridRowHeaderAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowsPresenterAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridRowsPresenterAutomationPeer.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+// #define DEBUG_AUTOMATION
 using System.Collections.Generic;
 using Microsoft.Toolkit.Uwp.UI.Controls.Primitives;
 using Windows.UI.Xaml.Automation.Peers;
@@ -74,7 +75,11 @@ protected override IList<AutomationPeer> GetChildrenCore()
         /// <returns>The string that contains the name.</returns>
         protected override string GetClassNameCore()
         {
-            return Owner.GetType().Name;
+            string classNameCore = Owner.GetType().Name;
+#if DEBUG_AUTOMATION
+            System.Diagnostics.Debug.WriteLine("DataGridRowsPresenterAutomationPeer.GetClassNameCore returns " + classNameCore);
+#endif
+            return classNameCore;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRowHeader.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRowHeader.cs
@@ -57,7 +57,7 @@ public partial class DataGridRowHeader : ContentControl
         private const string DATAGRIDROWHEADER_stateNormal = "Normal";
         private const string DATAGRIDROWHEADER_stateNormalCurrentRow = "NormalCurrentRow";
         private const string DATAGRIDROWHEADER_stateNormalEditingRow = "UnfocusedEditingRow";
-        private const string DATAGRIDROWHEADER_stateNormalEditingRowFocused = "Normal EditingRow";
+        private const string DATAGRIDROWHEADER_stateNormalEditingRowFocused = "NormalEditingRow";
         private const string DATAGRIDROWHEADER_stateSelected = "UnfocusedSelected";
         private const string DATAGRIDROWHEADER_stateSelectedCurrentRow = "UnfocusedCurrentRowSelected";
         private const string DATAGRIDROWHEADER_stateSelectedCurrentRowFocused = "NormalCurrentRowSelected";

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,11 @@ protected override IList<AutomationPeer> GetChildrenCore()`
`184`	`184`	`/// <returns>The string that contains the name.</returns>`
`185`	`185`	`protected override string GetClassNameCore()`
`186`	`186`	`{`
`187`		`- return Owner.GetType().Name;`
	`187`	`+ string classNameCore = Owner.GetType().Name;`
	`188`	`+#if DEBUG_AUTOMATION`
	`189`	`+ Debug.WriteLine("DataGridAutomationPeer.GetClassNameCore returns " + classNameCore);`
	`190`	`+#endif`
	`191`	`+ return classNameCore;`
`188`	`192`	`}`
`189`	`193`
`190`	`194`	`/// <summary>`
`@@ -212,6 +216,10 @@ protected override string GetNameCore()`
`212`	`216`	`}`
`213`	`217`	`}`
`214`	`218`
	`219`	`+#if DEBUG_AUTOMATION`
	`220`	`+ Debug.WriteLine("DataGridAutomationPeer.GetNameCore returns " + name);`
	`221`	`+#endif`
	`222`	`+`
`215`	`223`	`return name;`
`216`	`224`	`}`
`217`	`225`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`	`4`
	`5`	`+// #define DEBUG_AUTOMATION`
`5`	`6`	`using Microsoft.Toolkit.Uwp.UI.Controls;`
`6`	`7`	`using Windows.UI.Xaml.Automation.Peers;`
`7`	`8`
`@@ -37,7 +38,11 @@ protected override AutomationControlType GetAutomationControlTypeCore()`
`37`	`38`	`/// <returns>The string that contains the name.</returns>`
`38`	`39`	`protected override string GetClassNameCore()`
`39`	`40`	`{`
`40`		`- return Owner.GetType().Name;`
	`41`	`+ string classNameCore = Owner.GetType().Name;`
	`42`	`+#if DEBUG_AUTOMATION`
	`43`	`+ System.Diagnostics.Debug.WriteLine("DataGridRowGroupHeaderAutomationPeer.GetClassNameCore returns " + classNameCore);`
	`44`	`+#endif`
	`45`	`+ return classNameCore;`
`41`	`46`	`}`
`42`	`47`	`}`
`43`	`48`	`}`