From e46a6edbebaa4536d1d1aecd868c2dffb195fa08 Mon Sep 17 00:00:00 2001
From: Dong Bin <popmessiah@hotmail.com>
Date: Wed, 5 Nov 2025 01:33:20 +0800
Subject: [PATCH 1/2] chore: update Avalonia version to 11.3.7 across project
 files

---
 demo/Directory.Build.props                       | 2 +-
 src/Package.props                                | 2 +-
 tests/HeadlessTest.Ursa/HeadlessTest.Ursa.csproj | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/demo/Directory.Build.props b/demo/Directory.Build.props
index 0409c35..1def93d 100644
--- a/demo/Directory.Build.props
+++ b/demo/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <AvaloniaVersion>11.2.5</AvaloniaVersion>
+    <AvaloniaVersion>11.3.7</AvaloniaVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/Package.props b/src/Package.props
index 6406619..395c317 100644
--- a/src/Package.props
+++ b/src/Package.props
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <Version>1.13.0</Version>
-        <AvaloniaVersion>11.1.1</AvaloniaVersion>
+        <AvaloniaVersion>11.3.7</AvaloniaVersion>
         <Authors>IRIHI Technology Co., Ltd.</Authors>
         <RepositoryUrl>https://github.com/irihitech/Ursa.Avalonia</RepositoryUrl>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
diff --git a/tests/HeadlessTest.Ursa/HeadlessTest.Ursa.csproj b/tests/HeadlessTest.Ursa/HeadlessTest.Ursa.csproj
index 24a152f..fe937c7 100644
--- a/tests/HeadlessTest.Ursa/HeadlessTest.Ursa.csproj
+++ b/tests/HeadlessTest.Ursa/HeadlessTest.Ursa.csproj
@@ -10,12 +10,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia.Headless.XUnit" Version="11.2.3" />
-        <PackageReference Include="Avalonia.Skia" Version="11.2.3" />
+        <PackageReference Include="Avalonia.Headless.XUnit" Version="11.3.7" />
+        <PackageReference Include="Avalonia.Skia" Version="11.3.7" />
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
         <PackageReference Include="coverlet.collector" Version="6.0.4"/>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
-        <PackageReference Include="Semi.Avalonia" Version="11.2.1.3" />
+        <PackageReference Include="Semi.Avalonia" Version="11.3.7" />
         <PackageReference Include="xunit" Version="2.5.3"/>
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3"/>
     </ItemGroup>

From 3c29764af44fb6b94a1fd69aae654d955ed5fa9b Mon Sep 17 00:00:00 2001
From: Dong Bin <popmessiah@hotmail.com>
Date: Fri, 7 Nov 2025 23:18:19 +0800
Subject: [PATCH 2/2] test: enhance accessibility tests for form controls

---
 .../FormAccessibilityTests.cs                   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/FormAccessibilityTests.cs b/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/FormAccessibilityTests.cs
index adfceaa..0e2b234 100644
--- a/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/FormAccessibilityTests.cs
+++ b/tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/FormAccessibilityTests.cs
@@ -1,8 +1,10 @@
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Headless;
 using Avalonia.Headless.XUnit;
 using Avalonia.Input;
 using Avalonia.LogicalTree;
+using Avalonia.VisualTree;
 using Ursa.Controls;
 
 namespace HeadlessTest.Ursa.Controls.FormTests.AccessibilityTests;
@@ -19,6 +21,11 @@ public class FormAccessibilityTests
 
         Assert.False(form.NameBox.IsFocused);
         Assert.False(form.EmailBox.IsFocused);
+        var label1 = form.GetVisualDescendants().OfType<Label>().First();
+        Assert.Equal("_Name", label1.Content);
+        var position1 = label1.TranslatePoint(new Point(), window);
+        Assert.NotNull(position1);
+        window.MouseDown(position1.Value, MouseButton.Left);
         window.KeyPressQwerty(PhysicalKey.N, RawInputModifiers.Alt);
         Assert.True(form.NameBox.IsFocused);
         Assert.False(form.EmailBox.IsFocused);
@@ -37,6 +44,11 @@ public class FormAccessibilityTests
 
         Assert.False(form.NameBox.IsFocused);
         Assert.False(form.EmailBox.IsFocused);
+        var label1 = form.GetVisualDescendants().OfType<Label>().First();
+        Assert.Equal("_Name", label1.Content);
+        var position1 = label1.TranslatePoint(new Point(), window);
+        Assert.NotNull(position1);
+        window.MouseDown(position1.Value, MouseButton.Left);
         window.KeyPressQwerty(PhysicalKey.N, RawInputModifiers.Alt);
         Assert.True(form.NameBox.IsFocused);
         Assert.False(form.EmailBox.IsFocused);
@@ -68,6 +80,11 @@ public class FormAccessibilityTests
         
         Assert.False(text1.IsFocused);
         Assert.False(text2.IsFocused);
+        var label1 = form.GetVisualDescendants().OfType<Label>().First();
+        Assert.Equal("_Name", label1.Content);
+        var position1 = label1.TranslatePoint(new Point(), window);
+        Assert.NotNull(position1);
+        window.MouseDown(position1.Value, MouseButton.Left);
         window.KeyPressQwerty(PhysicalKey.N, RawInputModifiers.Alt);
         Assert.True(text1.IsFocused);
         Assert.False(text2.IsFocused);