chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: fix accessibility for dynamic generated form.

Browse Source
This commit is contained in:
Dong Bin
2025-01-10 21:49:56 +08:00
parent 47b39b9e74
commit b707a2ebda
6 changed files with 90 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Ursa.Themes.Semi/Controls/Form.axaml
View File

@@ -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}"

40
src/Ursa/Controls/Form/FormItem.cs
View File

@@ -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);

18
tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/FormAccessibilityTests.cs
View File

@@ -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()

2
tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/StaticForm.axaml
View File

@@ -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>

17
tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/StaticForm2.axaml Normal file
View File

@@ -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>

13
tests/HeadlessTest.Ursa/Controls/FormTests/AccessibilityTests/StaticForm2.axaml.cs Normal file
View File

@@ -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();
}
}