From 3dce2b13e32c022fbcb44c913155c9e7f27715ce Mon Sep 17 00:00:00 2001
From: dotMorten <no@spam.thx>
Date: Wed, 27 Aug 2025 16:58:55 -0700
Subject: [PATCH] Sets a11y properties on FeatureForm

---
 .../FeatureForm/FeatureFormView.Theme.xaml        | 15 ++++++++++++---
 .../Controls/FeatureForm/FeatureForm.Theme.xaml   |  3 ++-
 .../FeatureForm/FieldFormElementView.Maui.cs      |  2 ++
 .../RadioButtonsFormInputView.Windows.cs          |  3 +++
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/Toolkit/Toolkit.WPF/UI/Controls/FeatureForm/FeatureFormView.Theme.xaml b/src/Toolkit/Toolkit.WPF/UI/Controls/FeatureForm/FeatureFormView.Theme.xaml
index bb7876f6b..fc38bc54f 100644
--- a/src/Toolkit/Toolkit.WPF/UI/Controls/FeatureForm/FeatureFormView.Theme.xaml
+++ b/src/Toolkit/Toolkit.WPF/UI/Controls/FeatureForm/FeatureFormView.Theme.xaml
@@ -89,7 +89,14 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type primitives:ComboBoxFormInputView}">
-          <ComboBox x:Name="Selector" IsEnabled="{TemplateBinding IsEnabled}" />
+            <ComboBox x:Name="Selector" IsEnabled="{TemplateBinding IsEnabled}" >
+                <ComboBox.ItemContainerStyle>
+                    <Style TargetType="ComboBoxItem">
+                        <Setter Property="AutomationProperties.Name" Value="{Binding Name}" />
+                        <Setter Property="AutomationProperties.HelpText" Value="{Binding Description}" />
+                    </Style>
+                </ComboBox.ItemContainerStyle>
+            </ComboBox>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
@@ -166,7 +173,8 @@
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <TextBox x:Name="TextInput" MaxLines="{TemplateBinding MaxLines}" MinLines="{TemplateBinding MinLines}" BorderThickness="0" />
+                    <TextBox x:Name="TextInput" MaxLines="{TemplateBinding MaxLines}" MinLines="{TemplateBinding MinLines}" BorderThickness="0"
+                              AutomationProperties.Name="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Element.Label}" AutomationProperties.HelpText="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Element.Description}" />
                     <TextBlock Text="!" Background="Transparent" Width="10" Foreground="Red" Visibility="Collapsed" HorizontalAlignment="Right" VerticalAlignment="Center" x:Name="ErrorInfo" Grid.Column="1" />
                     <Button Content="&#xED14;" FontFamily="Segoe MDL2 Assets" Background="Transparent" Grid.Column="2"
                        Padding="8" Margin="-8,-8,-5,-7" BorderThickness="0" Visibility="Collapsed" HorizontalAlignment="Right" VerticalAlignment="Center" x:Name="BarcodeButton" />
@@ -257,7 +265,8 @@
         <ControlTemplate TargetType="{x:Type primitives:FieldFormElementView}">
           <StackPanel>
             <TextBlock Text="{Binding Label}" Style="{StaticResource FeatureFormViewTitleStyle}"/>
-            <ContentControl Margin="0,3" Foreground="Gray" Content="{Binding}" x:Name="FieldInput" KeyboardNavigation.IsTabStop="False">
+            <ContentControl Margin="0,3" Foreground="Gray" Content="{Binding}" x:Name="FieldInput" KeyboardNavigation.IsTabStop="False"
+                           >
               <ContentControl.ToolTip>
                 <ToolTip Content="{Binding Hint}">
                   <ToolTip.Style>
diff --git a/src/Toolkit/Toolkit.WinUI/UI/Controls/FeatureForm/FeatureForm.Theme.xaml b/src/Toolkit/Toolkit.WinUI/UI/Controls/FeatureForm/FeatureForm.Theme.xaml
index 055d57cfa..a23154334 100644
--- a/src/Toolkit/Toolkit.WinUI/UI/Controls/FeatureForm/FeatureForm.Theme.xaml
+++ b/src/Toolkit/Toolkit.WinUI/UI/Controls/FeatureForm/FeatureForm.Theme.xaml
@@ -229,7 +229,8 @@
                 <ControlTemplate TargetType="primitives:FieldFormElementView">
                     <StackPanel>
                         <TextBlock Text="{Binding Label}" Style="{StaticResource FeatureFormViewTitleStyle}"/>
-                        <ContentControl Margin="0,3" Foreground="Gray" Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Element}" x:Name="FieldInput" IsTabStop="False" HorizontalContentAlignment="Stretch">
+                        <ContentControl Margin="0,3" Foreground="Gray" Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Element}" x:Name="FieldInput" IsTabStop="False" HorizontalContentAlignment="Stretch"
+                                        AutomationProperties.Name="{Binding Label}" AutomationProperties.HelpText="{Binding Description}">
                             <ToolTipService.ToolTip>
                                 <ToolTip Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Element.Hint}" Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Element.Hint, Converter={StaticResource FeatureFormViewVisibilityConverter}}" />
                             </ToolTipService.ToolTip>
diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldFormElementView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldFormElementView.Maui.cs
index edb49b5be..8d58b3f0b 100644
--- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldFormElementView.Maui.cs
+++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldFormElementView.Maui.cs
@@ -111,6 +111,8 @@ private static object BuildDefaultTemplate()
             root.Children.Add(label);
             var content = new ContentControl();
             content.SetBinding(ContentControl.ContentDataProperty, static (FieldFormElementView view) => view.Element, source: RelativeBindingSource.TemplatedParent);
+            content.SetBinding(SemanticProperties.DescriptionProperty, static (FieldFormElementView view) => view.Element?.Label, source: RelativeBindingSource.TemplatedParent);
+            content.SetBinding(SemanticProperties.HintProperty, static (FieldFormElementView view) => view.Element?.Description, source: RelativeBindingSource.TemplatedParent);
             root.Children.Add(content);
             var errorLabel = new Label() { Margin = new Thickness(0, 2), TextColor = Colors.Red };
             root.Children.Add(errorLabel);
diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/RadioButtonsFormInputView.Windows.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/RadioButtonsFormInputView.Windows.cs
index b4ee01588..c9894d09b 100644
--- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/RadioButtonsFormInputView.Windows.cs
+++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/RadioButtonsFormInputView.Windows.cs
@@ -91,6 +91,9 @@ protected override void PrepareContainerForItemOverride(DependencyObject element
                 {
                     if (object.Equals(cv.Code, Element?.Value))
                         isChecked = true;
+#if WPF
+                    System.Windows.Automation.AutomationProperties.SetName(radio, cv.Name);
+#endif
                 }
                 else if(item is RadioButtonNullValue && Element?.Value is null)
                 {