From d7572721a4221f7b5a71b009edf9e8abc02a3543 Mon Sep 17 00:00:00 2001
From: Dong Bin <popmessiah@hotmail.com>
Date: Fri, 10 Jan 2025 21:13:37 +0800
Subject: [PATCH 1/4] test: add static a11y test.

---
 .../FormAccessibilityTests.cs                 | 27 +++++++++++++++++++
 .../AccessibilityTests/StaticForm.axaml       | 13 +++++++++
 .../AccessibilityTests/StaticForm.axaml.cs    | 13 +++++++++
 .../HeadlessTest.Ursa.csproj                  |  1 -
 4 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/FormAccessibilityTests.cs
 create mode 100644 tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/StaticForm.axaml
 create mode 100644 tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/StaticForm.axaml.cs

diff --git a/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/FormAccessibilityTests.cs b/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/FormAccessibilityTests.cs
new file mode 100644
index 0000000..e73e96e
--- /dev/null
+++ b/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/FormAccessibilityTests.cs
@@ -0,0 +1,27 @@
+using Avalonia.Controls;
+using Avalonia.Headless;
+using Avalonia.Headless.XUnit;
+using Avalonia.Input;
+
+namespace HeadlessTest.Ursa.Controls.FormTests.AccessibilityTests;
+
+public class FormAccessibilityTests
+{
+    [AvaloniaFact]
+    public void Form_Inner_Control_Accessible()
+    {
+        var window = new Window();
+        var form = new StaticForm();
+        window.Content = form;
+        window.Show();
+
+        Assert.False(form.NameBox.IsFocused);
+        Assert.False(form.EmailBox.IsFocused);
+        window.KeyPressQwerty(PhysicalKey.N, RawInputModifiers.Alt);
+        Assert.True(form.NameBox.IsFocused);
+        Assert.False(form.EmailBox.IsFocused);
+        window.KeyPressQwerty(PhysicalKey.E, RawInputModifiers.Alt);
+        Assert.False(form.NameBox.IsFocused);
+        Assert.True(form.EmailBox.IsFocused);
+    }
+}
\ No newline at end of file
diff --git a/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/StaticForm.axaml b/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/StaticForm.axaml
new file mode 100644
index 0000000..d20690b
--- /dev/null
+++ b/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/StaticForm.axaml
@@ -0,0 +1,13 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:u="https://irihi.tech/ursa"
+             mc:Ignorable="d" d:DesignWidth="800"
+             d:DesignHeight="450"
+             x:Class="HeadlessTest.Ursa.Controls.FormTests.AccessibilityTests.StaticForm">
+    <u:Form>
+        <TextBox Name="NameBox" Width="300" u:FormItem.Label="_Name" />
+        <TextBox Name="EmailBox" Width="300" u:FormItem.Label="_Email" />
+    </u:Form>
+</UserControl>
diff --git a/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/StaticForm.axaml.cs b/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/StaticForm.axaml.cs
new file mode 100644
index 0000000..d3729d0
--- /dev/null
+++ b/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/StaticForm.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace HeadlessTest.Ursa.Controls.FormTests.AccessibilityTests;
+
+public partial class StaticForm : UserControl
+{
+    public StaticForm()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/tests/HeadlessTest.Ursa/HeadlessTest.Ursa.csproj b/tests/HeadlessTest.Ursa/HeadlessTest.Ursa.csproj
index 977c521..63bbc71 100644
--- a/tests/HeadlessTest.Ursa/HeadlessTest.Ursa.csproj
+++ b/tests/HeadlessTest.Ursa/HeadlessTest.Ursa.csproj
@@ -4,7 +4,6 @@
         <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-
         <IsPackable>false</IsPackable>
         <IsTestProject>true</IsTestProject>
     </PropertyGroup>

From 47b39b9e743a057310cf6cfbd1bae6221dcd4545 Mon Sep 17 00:00:00 2001
From: Dong Bin <popmessiah@hotmail.com>
Date: Fri, 10 Jan 2025 21:27:30 +0800
Subject: [PATCH 2/4] test: dynamic form a11y failure.

---
 .../AccessibilityTests/DynamicForm.axaml      | 26 ++++++++++++++
 .../AccessibilityTests/DynamicForm.axaml.cs   | 31 ++++++++++++++++
 .../FormAccessibilityTests.cs                 | 35 ++++++++++++++++++-
 3 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/DynamicForm.axaml
 create mode 100644 tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/DynamicForm.axaml.cs

diff --git a/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/DynamicForm.axaml b/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/DynamicForm.axaml
new file mode 100644
index 0000000..9dbaba4
--- /dev/null
+++ b/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/DynamicForm.axaml
@@ -0,0 +1,26 @@
+<UserControl
+    x:Class="HeadlessTest.Ursa.Controls.FormTests.AccessibilityTests.DynamicForm"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:accessibilityTests="clr-namespace:HeadlessTest.Ursa.Controls.FormTests.AccessibilityTests"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:u="https://irihi.tech/ursa"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    x:CompileBindings="True"
+    x:DataType="accessibilityTests:DynamicFormViewModel"
+    mc:Ignorable="d">
+    <u:Form Name="form" ItemsSource="{Binding Items}">
+        <u:Form.Styles>
+            <Style x:DataType="accessibilityTests:FormTextViewModel" Selector="u|FormItem">
+                <Setter Property="Label" Value="{Binding Label}" />
+            </Style>
+        </u:Form.Styles>
+        <u:Form.ItemTemplate>
+            <DataTemplate DataType="accessibilityTests:FormTextViewModel">
+                <TextBox Text="{Binding Value}" />
+            </DataTemplate>
+        </u:Form.ItemTemplate>
+    </u:Form>
+</UserControl>
diff --git a/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/DynamicForm.axaml.cs b/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/DynamicForm.axaml.cs
new file mode 100644
index 0000000..822ff72
--- /dev/null
+++ b/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/DynamicForm.axaml.cs
@@ -0,0 +1,31 @@
+using System.Collections.ObjectModel;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace HeadlessTest.Ursa.Controls.FormTests.AccessibilityTests;
+
+public partial class DynamicForm : UserControl
+{
+    public DynamicForm()
+    {
+        InitializeComponent();
+        this.DataContext = new DynamicFormViewModel();
+    }
+}
+
+public partial class DynamicFormViewModel: ObservableObject
+{
+    public ObservableCollection<FormTextViewModel> Items { get; set; } =
+    [
+        new() { Label = "_Name" },
+        new() { Label = "_Email" }
+    ];
+}
+
+public partial class FormTextViewModel : ObservableObject
+{
+    [ObservableProperty] private string? _label;
+    [ObservableProperty] private string? _value;
+}
\ No newline at end of file
diff --git a/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/FormAccessibilityTests.cs b/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/FormAccessibilityTests.cs
index e73e96e..f27102a 100644
--- a/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/FormAccessibilityTests.cs
+++ b/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/FormAccessibilityTests.cs
@@ -2,13 +2,15 @@ using Avalonia.Controls;
 using Avalonia.Headless;
 using Avalonia.Headless.XUnit;
 using Avalonia.Input;
+using Avalonia.LogicalTree;
+using Ursa.Controls;
 
 namespace HeadlessTest.Ursa.Controls.FormTests.AccessibilityTests;
 
 public class FormAccessibilityTests
 {
     [AvaloniaFact]
-    public void Form_Inner_Control_Accessible()
+    public void Static_Form_Inner_Control_Accessible()
     {
         var window = new Window();
         var form = new StaticForm();
@@ -24,4 +26,35 @@ public class FormAccessibilityTests
         Assert.False(form.NameBox.IsFocused);
         Assert.True(form.EmailBox.IsFocused);
     }
+
+    [AvaloniaFact]
+    public void Dynamic_Form_Inner_Control_Accessible()
+    {
+        var window = new Window();
+        var form = new DynamicForm();
+        window.Content = form;
+        window.Show();
+
+        var logicalChildren = form.form.GetLogicalChildren().ToList();
+        Assert.Equal(2, logicalChildren.Count);
+        var first = logicalChildren[0] as FormItem;
+        var second = logicalChildren[1] as FormItem;
+        Assert.NotNull(first);
+        Assert.NotNull(second);
+
+        var text1 = first.GetLogicalChildren().OfType<TextBox>().FirstOrDefault();
+        var text2 = second.GetLogicalChildren().OfType<TextBox>().FirstOrDefault();
+        
+        Assert.NotNull(text1);
+        Assert.NotNull(text2);
+        
+        Assert.False(text1.IsFocused);
+        Assert.False(text2.IsFocused);
+        window.KeyPressQwerty(PhysicalKey.N, RawInputModifiers.Alt);
+        Assert.True(text1.IsFocused);
+        Assert.False(text2.IsFocused);
+        window.KeyPressQwerty(PhysicalKey.E, RawInputModifiers.Alt);
+        Assert.False(text1.IsFocused);
+        Assert.True(text2.IsFocused);
+    }
 }
\ No newline at end of file

From b707a2ebdaf324e3a4f859feb1656faf84e98ad3 Mon Sep 17 00:00:00 2001
From: Dong Bin <popmessiah@hotmail.com>
Date: Fri, 10 Jan 2025 21:49:56 +0800
Subject: [PATCH 3/4] fix: fix accessibility for dynamic generated form.

---
 src/Ursa.Themes.Semi/Controls/Form.axaml      |  4 +-
 src/Ursa/Controls/Form/FormItem.cs            | 40 ++++++++++++++++++-
 .../FormAccessibilityTests.cs                 | 18 +++++++++
 .../AccessibilityTests/StaticForm.axaml       |  2 +-
 .../AccessibilityTests/StaticForm2.axaml      | 17 ++++++++
 .../AccessibilityTests/StaticForm2.axaml.cs   | 13 ++++++
 6 files changed, 90 insertions(+), 4 deletions(-)
 create mode 100644 tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/StaticForm2.axaml
 create mode 100644 tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/StaticForm2.axaml.cs

diff --git a/src/Ursa.Themes.Semi/Controls/Form.axaml b/src/Ursa.Themes.Semi/Controls/Form.axaml
index 2449459..ee33650 100644
--- a/src/Ursa.Themes.Semi/Controls/Form.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Form.axaml
@@ -59,6 +59,7 @@
                         HorizontalAlignment="{TemplateBinding LabelAlignment}"
                         Orientation="Horizontal">
                         <Label
+                            Name="PART_Label"
                             Content="{TemplateBinding Label}"
                             Background="Transparent"
                             FontWeight="{DynamicResource TextBlockTitleFontWeight}"
@@ -98,8 +99,7 @@
                                     Name="PART_Label"
                                     Content="{TemplateBinding Label}"
                                     Background="Transparent"
-                                    FontWeight="{DynamicResource TextBlockTitleFontWeight}"
-                                    Target="{Binding #PART_ContentPresenter.Content}" />
+                                    FontWeight="{DynamicResource TextBlockTitleFontWeight}"/>
                                 <TextBlock
                                     Foreground="{DynamicResource FormAsteriskForeground}"
                                     IsVisible="{TemplateBinding IsRequired}"
diff --git a/src/Ursa/Controls/Form/FormItem.cs b/src/Ursa/Controls/Form/FormItem.cs
index 9157f06..dc70d6a 100644
--- a/src/Ursa/Controls/Form/FormItem.cs
+++ b/src/Ursa/Controls/Form/FormItem.cs
@@ -1,6 +1,9 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Primitives;
+using Avalonia.Input;
+using Avalonia.Interactivity;
 using Avalonia.Layout;
 using Avalonia.Reactive;
 using Avalonia.VisualTree;
@@ -10,8 +13,10 @@ using Ursa.Common;
 namespace Ursa.Controls;
 
 [PseudoClasses(PC_Horizontal, PC_NoLabel)]
+[TemplatePart(PART_Label, typeof(Label))]
 public class FormItem: ContentControl
 {
+    public const string PART_Label = "PART_Label";
     public const string PC_Horizontal = ":horizontal";
     public const string PC_NoLabel = ":no-label";
     
@@ -33,7 +38,8 @@ public class FormItem: ContentControl
     public static void SetNoLabel(Control obj, bool value) => obj.SetValue(NoLabelProperty, value);
     public static bool GetNoLabel(Control obj) => obj.GetValue(NoLabelProperty);
     #endregion
-    
+
+    private Label? _label;
     private List<IDisposable> _formSubscriptions = new List<IDisposable>();
 
     public static readonly StyledProperty<double> LabelWidthProperty = AvaloniaProperty.Register<FormItem, double>(
@@ -57,6 +63,8 @@ public class FormItem: ContentControl
     static FormItem()
     {
         NoLabelProperty.AffectsPseudoClass<FormItem>(PC_NoLabel);
+        LabelProperty.Changed.AddClassHandler<FormItem>((o, e) => o.SetLabelTarget());
+        ContentProperty.Changed.AddClassHandler<FormItem>((o, e) => o.SetLabelTarget());
     }
 
     protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
@@ -81,6 +89,36 @@ public class FormItem: ContentControl
         }
     }
 
+    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+    {
+        base.OnApplyTemplate(e);
+        _label = e.NameScope.Find<Label>(PART_Label);
+    }
+
+    protected override void OnLoaded(RoutedEventArgs e)
+    {
+        base.OnLoaded(e);
+        SetLabelTarget();
+    }
+
+    private void SetLabelTarget()
+    {
+        if (_label is null) return;
+        // Set it directly if content is a control, this is faster than looking up logical tree. 
+        if (Content is InputElement input)
+        {
+            _label.Target = input;
+        }
+        else
+        {
+            var logical = this.LogicalChildren.OfType<InputElement>().FirstOrDefault(a => a.Focusable);
+            if (logical is not null)
+            {
+                _label.Target = logical;
+            }
+        }
+    }
+
     protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
     {
         base.OnDetachedFromVisualTree(e);
diff --git a/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/FormAccessibilityTests.cs b/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/FormAccessibilityTests.cs
index f27102a..eefb959 100644
--- a/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/FormAccessibilityTests.cs
+++ b/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/FormAccessibilityTests.cs
@@ -26,6 +26,24 @@ public class FormAccessibilityTests
         Assert.False(form.NameBox.IsFocused);
         Assert.True(form.EmailBox.IsFocused);
     }
+    
+    [AvaloniaFact]
+    public void Static_Form_With_FormItem_Accessible()
+    {
+        var window = new Window();
+        var form = new StaticForm();
+        window.Content = form;
+        window.Show();
+
+        Assert.False(form.NameBox.IsFocused);
+        Assert.False(form.EmailBox.IsFocused);
+        window.KeyPressQwerty(PhysicalKey.N, RawInputModifiers.Alt);
+        Assert.True(form.NameBox.IsFocused);
+        Assert.False(form.EmailBox.IsFocused);
+        window.KeyPressQwerty(PhysicalKey.E, RawInputModifiers.Alt);
+        Assert.False(form.NameBox.IsFocused);
+        Assert.True(form.EmailBox.IsFocused);
+    }
 
     [AvaloniaFact]
     public void Dynamic_Form_Inner_Control_Accessible()
diff --git a/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/StaticForm.axaml b/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/StaticForm.axaml
index d20690b..53210fe 100644
--- a/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/StaticForm.axaml
+++ b/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/StaticForm.axaml
@@ -6,7 +6,7 @@
              mc:Ignorable="d" d:DesignWidth="800"
              d:DesignHeight="450"
              x:Class="HeadlessTest.Ursa.Controls.FormTests.AccessibilityTests.StaticForm">
-    <u:Form>
+    <u:Form LabelWidth="200" LabelPosition="Left" LabelAlignment="Left">
         <TextBox Name="NameBox" Width="300" u:FormItem.Label="_Name" />
         <TextBox Name="EmailBox" Width="300" u:FormItem.Label="_Email" />
     </u:Form>
diff --git a/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/StaticForm2.axaml b/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/StaticForm2.axaml
new file mode 100644
index 0000000..069b5e8
--- /dev/null
+++ b/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/StaticForm2.axaml
@@ -0,0 +1,17 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:u="https://irihi.tech/ursa"
+             mc:Ignorable="d" d:DesignWidth="800"
+             d:DesignHeight="450"
+             x:Class="HeadlessTest.Ursa.Controls.FormTests.AccessibilityTests.StaticForm2">
+    <u:Form LabelWidth="200" LabelPosition="Left" LabelAlignment="Left">
+        <u:FormItem Label="_Name">
+            <TextBox Name="NameBox" Width="300" />
+        </u:FormItem>
+        <u:FormItem Label="_Email">
+            <TextBox Name="EmailBox" Width="300" />
+        </u:FormItem>
+    </u:Form>
+</UserControl>
diff --git a/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/StaticForm2.axaml.cs b/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/StaticForm2.axaml.cs
new file mode 100644
index 0000000..c262be1
--- /dev/null
+++ b/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/StaticForm2.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace HeadlessTest.Ursa.Controls.FormTests.AccessibilityTests;
+
+public partial class StaticForm2 : UserControl
+{
+    public StaticForm2()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file

From 796fe4983f959308e1bdee46fbc27544e38d624d Mon Sep 17 00:00:00 2001
From: Dong Bin <popmessiah@hotmail.com>
Date: Fri, 10 Jan 2025 21:58:19 +0800
Subject: [PATCH 4/4] test: fix test case 2

---
 .../FormTests/AccessibilityTests/FormAccessibilityTests.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/FormAccessibilityTests.cs b/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/FormAccessibilityTests.cs
index eefb959..adfceaa 100644
--- a/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/FormAccessibilityTests.cs
+++ b/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/FormAccessibilityTests.cs
@@ -31,7 +31,7 @@ public class FormAccessibilityTests
     public void Static_Form_With_FormItem_Accessible()
     {
         var window = new Window();
-        var form = new StaticForm();
+        var form = new StaticForm2();
         window.Content = form;
         window.Show();