Merge pull request #317 from CommunityToolkit/niels9001/narrator-settingscontrols

[SettingsControls] Narrator improvements

Author: Arlodotexe

labs/SettingsControls/src/CommunityToolkit.Labs.WinUI.SettingsControls.csproj

@@ -18,7 +18,7 @@
     <Description>
       This package contains the SettingsCard and SettingsExpander controls.
     </Description>
-    <Version>0.0.8</Version>
+    <Version>0.0.9</Version>
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>
 

labs/SettingsControls/src/SettingsCard/SettingsCard.cs

@@ -49,21 +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);
-            }
-
-            if (Content != null && Content.GetType() != typeof(Button))
-            {
-                // We do not want to override the default AutomationProperties.Name of a button. Its Content property already describes what it does.
-                if (!string.IsNullOrEmpty(headerString))
-                {
-                    AutomationProperties.SetName((UIElement)Content, headerString);
-                }
+                AutomationProperties.SetName(element, headerString);
             }
         }
     }

labs/SettingsControls/src/SettingsExpander/SettingsExpander.Properties.cs

@@ -40,7 +40,7 @@ public partial class SettingsExpander
     /// </summary>
     public static readonly DependencyProperty ContentProperty = DependencyProperty.Register(
         nameof(Content),
-        typeof(UIElement),
+        typeof(object),
         typeof(SettingsExpander),
         new PropertyMetadata(defaultValue: null));
 
@@ -87,9 +87,9 @@ public IconElement HeaderIcon
     /// <summary>
     /// Gets or sets the Content.
     /// </summary>
-    public UIElement Content
+    public object Content
     {
-        get => (UIElement)GetValue(ContentProperty);
+        get => (object)GetValue(ContentProperty);
         set => SetValue(ContentProperty, value);
     }
 

labs/SettingsControls/src/SettingsExpander/SettingsExpander.cs

@@ -27,24 +27,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))
+            if (!string.IsNullOrEmpty(headerString) && string.IsNullOrEmpty(AutomationProperties.GetName(this)))
             {
                 AutomationProperties.SetName(this, headerString);
             }
-
-            if (Content != null && Content.GetType() != typeof(Button))
-            {
-                // We do not want to override the default AutomationProperties.Name of a button. Its Content property already describes what it does.
-                if (!string.IsNullOrEmpty(headerString))
-                {
-                    AutomationProperties.SetName((UIElement)Content, headerString);
-                }
-            }
         }
-
     }
 
     /// <summary>

labs/SettingsControls/src/SettingsExpander/SettingsExpander.xaml

@@ -1,4 +1,4 @@
-<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
+<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
@@ -53,8 +53,6 @@
             <Setter Property="BorderThickness" Value="{ThemeResource SettingsCardBorderThickness}" />
             <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
             <Setter Property="MinHeight" Value="{ThemeResource SettingsCardMinHeight}" />
-            <!--<Setter Property="win:AutomationProperties.AutomationControlType" Value="Group" />-->
-            <!--<Setter Property="win:AutomationProperties.Name" Value="{TemplateBinding Header}" />-->
             <Setter Property="MaxWidth" Value="{ThemeResource SettingsCardMaxWidth}" />
             <Setter Property="MinWidth" Value="{ThemeResource SettingsCardMinWidth}" />
             <Setter Property="IsTabStop" Value="False" />
@@ -75,8 +73,9 @@
                         <muxc:Expander MaxWidth="{TemplateBinding MaxWidth}"
                                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                       win:AutomationProperties.HelpText="{TemplateBinding AutomationProperties.HelpText}"
+                                       win:AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}"
                                        IsExpanded="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                       IsTabStop="False"
                                        Style="{StaticResource SettingsExpanderExpanderStyle}">
                             <muxc:Expander.Header>
                                 <labs:SettingsCard Padding="{StaticResource SettingsExpanderHeaderPadding}"
@@ -101,7 +100,6 @@
 
     <Style x:Key="SettingsExpanderExpanderStyle"
            TargetType="muxc:Expander">
-        <Setter Property="IsTabStop" Value="False" />
         <Setter Property="Background" Value="{ThemeResource ExpanderContentBackground}" />
         <Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
         <Setter Property="MinWidth" Value="{ThemeResource FlyoutThemeMinWidth}" />
@@ -230,6 +228,7 @@
                                       HorizontalContentAlignment="{StaticResource ExpanderHeaderHorizontalContentAlignment}"
                                       VerticalContentAlignment="{StaticResource ExpanderHeaderVerticalContentAlignment}"
                                       win:AutomationProperties.AutomationId="ExpanderToggleButton"
+                                      win:AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}"
                                       BackgroundSizing="{TemplateBinding BackgroundSizing}"
                                       BorderBrush="{ThemeResource ExpanderHeaderBorderBrush}"
                                       BorderThickness="{ThemeResource ExpanderHeaderBorderThickness}"
@@ -239,7 +238,7 @@
                                       CornerRadius="{TemplateBinding CornerRadius}"
                                       IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                                       IsEnabled="{TemplateBinding IsEnabled}"
-                                      IsTabStop="False"
+                                      IsTabStop="True"
                                       Style="{StaticResource SettingsExpanderHeaderDownStyle}" />
                         <!--  The clip is a composition clip applied in code  -->
                         <Border x:Name="ExpanderContentClip"
@@ -523,13 +522,12 @@
                                         VerticalAlignment="Center"
                                         HorizontalContentAlignment="Center"
                                         VerticalContentAlignment="Center"
-                                        win:AutomationProperties.Name="{StaticResource SettingsExpanderChevronToolTip}"
                                         Background="{ThemeResource ExpanderChevronBackground}"
                                         BorderBrush="{ThemeResource ExpanderChevronBorderBrush}"
                                         BorderThickness="{ThemeResource ExpanderChevronBorderThickness}"
                                         CornerRadius="{ThemeResource ControlCornerRadius}"
                                         FocusVisualMargin="-3"
-                                        IsTabStop="True"
+                                        IsTabStop="False"
                                         ToolTipService.ToolTip="{StaticResource SettingsExpanderChevronToolTip}"
                                         UseSystemFocusVisuals="True">
                             <muxc:AnimatedIcon x:Name="ExpandCollapseChevron"