From 374225624b5adf21f02795717e6bce0ab9680199 Mon Sep 17 00:00:00 2001
From: John Tasler <JohnTasler@users.noreply.github.com>
Date: Sun, 16 Feb 2025 05:09:03 -0800
Subject: [PATCH] fix: #1341: MenuItem template binding error (#1343)

* fix: #1341

Use more efficient `{TemplateBinding}` for `MenuItem` templates, which also fixes the incorrect `{Binding Path}` syntax for attached properties.

* fix: set `StaysOpenOnClick` on screen-reader `TextBlock`

* fix: Remove unnecessary TextBlock from MenuItem template
---
 src/Wpf.Ui/Controls/Menu/MenuItem.xaml | 42 --------------------------
 1 file changed, 42 deletions(-)

diff --git a/src/Wpf.Ui/Controls/Menu/MenuItem.xaml b/src/Wpf.Ui/Controls/Menu/MenuItem.xaml
index da8cb5f73..61a176453 100644
--- a/src/Wpf.Ui/Controls/Menu/MenuItem.xaml
+++ b/src/Wpf.Ui/Controls/Menu/MenuItem.xaml
@@ -74,16 +74,6 @@
                         ContentSource="Header"
                         RecognizesAccessKey="True"
                         TextElement.Foreground="{TemplateBinding Foreground}" />
-                    <!-- TextBlock added so that screen readers don't try to read Icon -->
-                    <TextBlock Grid.Column="0"
-                        Grid.ColumnSpan="3"
-                        Width="{Binding Width, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}"
-                        Height="{Binding Height, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}"
-                        Margin="-10"
-                        FontSize="1"
-                        Opacity="0"
-                        Text="{Binding AutomationProperties.Name, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}"
-                        Background="Black"/>
                 </Grid>
 
                 <Popup
@@ -191,16 +181,6 @@
                     ContentSource="Header"
                     RecognizesAccessKey="True"
                     TextElement.Foreground="{TemplateBinding Foreground}" />
-                <!-- TextBlock added so that screen readers don't try to read Icon -->
-                <TextBlock Grid.Column="0"
-                   Grid.ColumnSpan="3"
-                   Width="{Binding Width, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}"
-                   Height="{Binding Height, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}"
-                   Margin="-10"
-                   FontSize="1"
-                   Opacity="0"
-                   Text="{Binding AutomationProperties.Name, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}"
-                   Background="Black"/>
             </Grid>
         </Border>
         <ControlTemplate.Triggers>
@@ -284,17 +264,6 @@
                     FontSize="11"
                     Foreground="{DynamicResource TextFillColorDisabledBrush}"
                     Text="{TemplateBinding InputGestureText}" />
-                
-                <!-- TextBlock added so that screen readers don't try to read Icon -->
-                <TextBlock Grid.Column="0"
-                   Grid.ColumnSpan="5"
-                   Width="{Binding Width, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}"
-                   Height="{Binding Height, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}"
-                   Margin="-10"
-                   FontSize="1"
-                   Opacity="0"
-                   Text="{Binding AutomationProperties.Name, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}"
-                   Background="Black"/>
             </Grid>
         </Border>
         <ControlTemplate.Triggers>
@@ -365,17 +334,6 @@
                             FontSize="{TemplateBinding FontSize}"
                             Symbol="ChevronRight20" />
                     </Grid>
-                    
-                    <!-- Fix double narration from mousing over the button and then the associated text -->
-                    <TextBlock Grid.Column="0"
-                        Grid.ColumnSpan="3"
-                        Width="{Binding Width, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}"
-                        Height="{Binding Height, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}"
-                        Margin="-10"
-                        FontSize="1"
-                        Opacity="0"
-                        Text="{Binding AutomationProperties.Name, RelativeSource={RelativeSource AncestorType={x:Type MenuItem}}}"
-                        Background="Black"/>
                 </Grid>
             </Border>