Fixing A11y issues in combobox and scroll bar (#9064)

* Fixing ally issues in combobox and scroll bar * Fix DatePicker textbox and button ally issues
dotnet · Jun 6, 2024 · e8e3875 · e8e3875
1 parent 6c97dfe
commit e8e3875
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/ComboBox.xaml b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/ComboBox.xaml
@@ -245,7 +245,8 @@
                                             FontSize="{TemplateBinding FontSize}"
                                             Foreground="{TemplateBinding Foreground}"
                                             IsReadOnly="{TemplateBinding IsReadOnly}"
-                                            Style="{StaticResource DefaultComboBoxTextBoxStyle}" />
+                                            Style="{StaticResource DefaultComboBoxTextBoxStyle}"
+                                            AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}" />
                                     </Grid>
                                 </Grid>
                                 <Popup

diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/DatePicker.xaml b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/DatePicker.xaml
@@ -30,6 +30,7 @@
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="Background" Value="Transparent" />
+        <Setter Property="AutomationProperties.Name" Value="{Binding Path=(AutomationProperties.Name), Mode=OneWay, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type DatePicker}}}" />
         <Setter Property="Foreground">
             <Setter.Value>
                 <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
@@ -133,6 +134,7 @@
                                         VerticalContentAlignment="Center"
                                         Background="Transparent"
                                         BorderBrush="Transparent"
+                                        AutomationProperties.Name="{Binding Path=(AutomationProperties.Name), Mode=OneWay, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type DatePicker}}}"
                                         Cursor="Arrow">
                                         <!--  WPF overrides paddings for button  -->
 

diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/ScrollBar.xaml b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/ScrollBar.xaml
@@ -139,6 +139,7 @@
                 Command="ScrollBar.LineUpCommand"
                 Content="{StaticResource CaretUpGlyph}"
                 Opacity="0"
+                AutomationProperties.Name="Scroll Up"
                 Style="{StaticResource ScrollBarLineButtonStyle}" />
             <Track
                 x:Name="PART_Track"
@@ -168,6 +169,7 @@
                 Command="ScrollBar.LineDownCommand"
                 Content="{StaticResource CaretDownGlyph}"
                 Opacity="0"
+                AutomationProperties.Name="Scroll Down"
                 Style="{StaticResource ScrollBarLineButtonStyle}" />
         </Grid>
         <ControlTemplate.Triggers>
@@ -259,6 +261,7 @@
                 Command="ScrollBar.LineLeftCommand"
                 Content="{StaticResource CaretLeftGlyph}"
                 Opacity="0"
+                AutomationProperties.Name="Scroll Left"
                 Style="{StaticResource ScrollBarLineButtonStyle}" />
             <Track
                 x:Name="PART_Track"
@@ -286,6 +289,7 @@
                 Command="ScrollBar.LineRightCommand"
                 Content="{StaticResource CaretRightGlyph}"
                 Opacity="0"
+                AutomationProperties.Name="Scroll Right"
                 Style="{StaticResource ScrollBarLineButtonStyle}" />
         </Grid>
         <ControlTemplate.Triggers>