Skip to content

Commit 4f719ed

Browse files
Fixing Accessibility Issue in Expander
1. Changed the name of Toggle Button in expander to fix the narrator issue. (#9255) 2. Added the Automation Name to the Toggle Button
1 parent bfd8cac commit 4f719ed

File tree

1 file changed

+9
-8
lines changed
  • src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles

1 file changed

+9
-8
lines changed

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/Expander.xaml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,8 @@
308308
BorderThickness="1"
309309
CornerRadius="{TemplateBinding Border.CornerRadius}">
310310
<ToggleButton
311-
x:Name="ExpanderToggleButton"
311+
x:Name="HeaderSite"
312+
AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}"
312313
Margin="0"
313314
Padding="{TemplateBinding Padding}"
314315
HorizontalAlignment="Stretch"
@@ -550,7 +551,7 @@
550551
TargetName="ToggleButtonBorder"/>
551552
<Setter Property="Template"
552553
Value="{StaticResource DefaultExpanderToggleButtonRightStyle}"
553-
TargetName="ExpanderToggleButton"/>
554+
TargetName="HeaderSite"/>
554555
<Setter Property="RenderTransform"
555556
Value="{DynamicResource WidthAnimation}"
556557
TargetName="ContentPresenterBorder" />
@@ -566,7 +567,7 @@
566567
TargetName="ToggleButtonBorder"/>
567568
<Setter Property="Template"
568569
Value="{StaticResource DefaultExpanderToggleButtonUpStyle}"
569-
TargetName="ExpanderToggleButton"/>
570+
TargetName="HeaderSite"/>
570571
<Setter Property="RenderTransform"
571572
Value="{DynamicResource HeightAnimation}"
572573
TargetName="ContentPresenterBorder" />
@@ -589,7 +590,7 @@
589590
TargetName="ToggleButtonBorder"/>
590591
<Setter Property="Template"
591592
Value="{StaticResource DefaultExpanderToggleButtonLeftStyle}"
592-
TargetName="ExpanderToggleButton"/>
593+
TargetName="HeaderSite"/>
593594
<Setter Property="RenderTransform"
594595
Value="{DynamicResource WidthAnimation}"
595596
TargetName="ContentPresenterBorder" />
@@ -598,12 +599,12 @@
598599
<Trigger Property="IsEnabled"
599600
Value="False">
600601
<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ExpanderHeaderDisabledForeground}" />
601-
<Setter TargetName="ExpanderToggleButton" Property="Foreground" Value="{DynamicResource ExpanderHeaderDisabledForeground}" />
602-
<Setter TargetName="ExpanderToggleButton" Property="BorderBrush" Value="{DynamicResource ExpanderHeaderDisabledBorderBrush}" />
602+
<Setter TargetName="HeaderSite" Property="Foreground" Value="{DynamicResource ExpanderHeaderDisabledForeground}" />
603+
<Setter TargetName="HeaderSite" Property="BorderBrush" Value="{DynamicResource ExpanderHeaderDisabledBorderBrush}" />
603604
</Trigger>
604605

605-
<Trigger SourceName="ExpanderToggleButton" Property="IsMouseOver" Value="True">
606-
<Setter TargetName="ExpanderToggleButton" Property="BorderBrush" Value="{DynamicResource ExpanderHeaderBorderPointerOverBrush}" />
606+
<Trigger SourceName="HeaderSite" Property="IsMouseOver" Value="True">
607+
<Setter TargetName="HeaderSite" Property="BorderBrush" Value="{DynamicResource ExpanderHeaderBorderPointerOverBrush}" />
607608
</Trigger>
608609
</ControlTemplate.Triggers>
609610
</ControlTemplate>

0 commit comments

Comments
 (0)