From bf545f0778b4cf5c54defbb89742f05ba0781aab Mon Sep 17 00:00:00 2001
From: Himanshi Goyal <himgoyal@microsoft.com>
Date: Sat, 15 Jun 2024 19:07:36 +0530
Subject: [PATCH] 1. Changed the name of Toggle Button in expander to fix the
 narrator issue. 2. Added the Automation Name to the Toggle Button

---
 .../Styles/Expander.xaml                        | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/Expander.xaml b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/Expander.xaml
index 9179983b911..8251ec47709 100644
--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/Expander.xaml
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/Expander.xaml
@@ -308,7 +308,8 @@
                                 BorderThickness="1"
                                 CornerRadius="{TemplateBinding Border.CornerRadius}">
                             <ToggleButton
-                                        x:Name="ExpanderToggleButton"
+                                        x:Name="HeaderSite"
+                                        AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}"
                                         Margin="0"
                                         Padding="{TemplateBinding Padding}"
                                         HorizontalAlignment="Stretch"
@@ -550,7 +551,7 @@
                                     TargetName="ToggleButtonBorder"/>
                             <Setter Property="Template"
                                     Value="{StaticResource DefaultExpanderToggleButtonRightStyle}"
-                                    TargetName="ExpanderToggleButton"/>
+                                    TargetName="HeaderSite"/>
                             <Setter Property="RenderTransform"
                                     Value="{DynamicResource WidthAnimation}"
                                     TargetName="ContentPresenterBorder" />
@@ -566,7 +567,7 @@
                                     TargetName="ToggleButtonBorder"/>
                             <Setter Property="Template"
                                     Value="{StaticResource DefaultExpanderToggleButtonUpStyle}"
-                                    TargetName="ExpanderToggleButton"/>
+                                    TargetName="HeaderSite"/>
                             <Setter Property="RenderTransform"
                                     Value="{DynamicResource HeightAnimation}"
                                     TargetName="ContentPresenterBorder" />
@@ -589,7 +590,7 @@
                                     TargetName="ToggleButtonBorder"/>
                             <Setter Property="Template"
                                     Value="{StaticResource DefaultExpanderToggleButtonLeftStyle}"
-                                    TargetName="ExpanderToggleButton"/>
+                                    TargetName="HeaderSite"/>
                             <Setter Property="RenderTransform"
                                     Value="{DynamicResource WidthAnimation}"
                                     TargetName="ContentPresenterBorder" />
@@ -598,12 +599,12 @@
                         <Trigger Property="IsEnabled"
                                  Value="False">
                             <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ExpanderHeaderDisabledForeground}" />
-                            <Setter TargetName="ExpanderToggleButton" Property="Foreground" Value="{DynamicResource ExpanderHeaderDisabledForeground}" />
-                            <Setter TargetName="ExpanderToggleButton" Property="BorderBrush" Value="{DynamicResource ExpanderHeaderDisabledBorderBrush}" />
+                            <Setter TargetName="HeaderSite" Property="Foreground" Value="{DynamicResource ExpanderHeaderDisabledForeground}" />
+                            <Setter TargetName="HeaderSite" Property="BorderBrush" Value="{DynamicResource ExpanderHeaderDisabledBorderBrush}" />
                         </Trigger>
 
-                        <Trigger SourceName="ExpanderToggleButton" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="ExpanderToggleButton" Property="BorderBrush" Value="{DynamicResource ExpanderHeaderBorderPointerOverBrush}" />
+                        <Trigger SourceName="HeaderSite" Property="IsMouseOver" Value="True">
+                            <Setter TargetName="HeaderSite" Property="BorderBrush" Value="{DynamicResource ExpanderHeaderBorderPointerOverBrush}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>