Feedback

Author: niels9001

labs/SettingsControls/src/SettingsCard/SettingsCard.cs

@@ -49,18 +49,13 @@ protected override void OnApplyTemplate()
 
     private void RegisterAutomation()
     {
-        if (Header != null && Header.GetType() == typeof(string))
+        if (Header is string headerString && headerString != string.Empty)
         {
-            string? headerString = Header.ToString();
-            if (!string.IsNullOrEmpty(headerString))
+            AutomationProperties.SetName(this, headerString);
+            // We don't want to override an AutomationProperties.Name that is manually set, or if the Content basetype is of type ButtonBase (the ButtonBase.Content will be used then)
+            if (Content is UIElement element && string.IsNullOrEmpty(AutomationProperties.GetName(element)) && element.GetType().BaseType != typeof(ButtonBase))
             {
-                AutomationProperties.SetName(this, headerString);
-
-                // We don't want to override an AutomationProperties.Name that is manually set, or if the Content basetype is of type ButtonBase (the ButtonBase.Content will be used then)
-                if (Content != null && string.IsNullOrEmpty(AutomationProperties.GetName((UIElement)Content)) && Content.GetType().BaseType != typeof(ButtonBase))
-                {
-                    AutomationProperties.SetName((UIElement)Content, headerString);
-                }
+                AutomationProperties.SetName(element, headerString);
             }
         }
     }

labs/SettingsControls/src/SettingsExpander/SettingsExpander.cs

@@ -27,9 +27,8 @@ protected override void OnApplyTemplate()
 
     private void RegisterAutomation()
     {
-        if (Header != null && Header.GetType() == typeof(string))
+        if (Header is string headerString && headerString != string.Empty)
         {
-            string? headerString = Header.ToString();
             if (!string.IsNullOrEmpty(headerString) && string.IsNullOrEmpty(AutomationProperties.GetName(this)))
             {
                 AutomationProperties.SetName(this, headerString);