Browse Source

Allow [AssignBinding] on attached property getters (#18425)

Co-authored-by: Jumar Macato <16554748+jmacato@users.noreply.github.com>
release/11.3.0-beta1
Julien Lebosquain 10 months ago
committed by GitHub
parent
commit
af7c3c7d2c
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      external/XamlX
  2. 2
      src/Avalonia.Base/Data/AssignBindingAttribute.cs
  3. 5
      src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
  4. 62
      tests/Avalonia.Markup.Xaml.UnitTests/Xaml/AssignBindingTests.cs

2
external/XamlX

@ -1 +1 @@
Subproject commit ab84721302d6ed2b8b65315f3c54217693640348
Subproject commit cbfec32876a79e855bd49da034214bbf2bf35b13

2
src/Avalonia.Base/Data/AssignBindingAttribute.cs

@ -10,7 +10,7 @@ namespace Avalonia.Data
/// Applying this attribute to a property indicates that the binding should be assigned to
/// the property rather than bound.
/// </remarks>
[AttributeUsage(AttributeTargets.Property)]
[AttributeUsage(AttributeTargets.Property | AttributeTargets.Method)]
public sealed class AssignBindingAttribute : Attribute
{
}

5
src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs

@ -204,12 +204,11 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
public IXamlField AvaloniaProperty { get; }
public XamlIlAvaloniaProperty(XamlAstClrProperty original, IXamlField field,
AvaloniaXamlIlWellKnownTypes types)
:base(original, original.Name, original.DeclaringType, original.Getter, original.Setters)
:base(original, original.Name, original.DeclaringType, original.Getter, original.Setters, original.CustomAttributes)
{
var assignBinding = original.CustomAttributes.Any(ca => ca.Type.Equals(types.AssignBindingAttribute));
AvaloniaProperty = field;
CustomAttributes = original.CustomAttributes;
if (!assignBinding)
Setters.Insert(0, new BindingSetter(types, original.DeclaringType, field));
@ -459,7 +458,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
public XamlIlAvaloniaClassProperty(AvaloniaXamlIlWellKnownTypes types,
string className,
IXamlLineInfo lineInfo) : base(lineInfo, className, types.Classes, null, null, null)
IXamlLineInfo lineInfo) : base(lineInfo, className, types.Classes, null)
{
Parameters = [types.XamlIlTypes.String];
_method = types.GetClassProperty;

62
tests/Avalonia.Markup.Xaml.UnitTests/Xaml/AssignBindingTests.cs

@ -0,0 +1,62 @@
#nullable enable
using Avalonia.Controls;
using Avalonia.Data;
using Avalonia.UnitTests;
using Xunit;
namespace Avalonia.Markup.Xaml.UnitTests.Xaml;
public class AssignBindingTests : XamlTestBase
{
[Fact]
public void AssignBinding_Works_With_Clr_Property()
{
using var app = UnitTestApplication.Start(TestServices.StyledWindow);
var control = (AssignBindingTestControl)AvaloniaRuntimeXamlLoader.Load(
"""
<local:AssignBindingTestControl
xmlns='https://github.com/avaloniaui'
xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'
ClrBinding='{Binding SomePath}' />
""");
Assert.NotNull(control.ClrBinding);
}
[Fact]
public void AssignBinding_Works_With_AttachedProperty()
{
using var app = UnitTestApplication.Start(TestServices.StyledWindow);
var control = (Control)AvaloniaRuntimeXamlLoader.Load(
"""
<Control
xmlns='https://github.com/avaloniaui'
xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'
local:AssignBindingTestControl.AttachedBinding='{Binding SomePath}' />
""");
var binding = AssignBindingTestControl.GetAttachedBinding(control);
Assert.NotNull(binding);
}
}
public sealed class AssignBindingTestControl : Control
{
[AssignBinding]
public IBinding? ClrBinding { get; set; }
public static readonly AttachedProperty<IBinding?> AttachedBindingProperty =
AvaloniaProperty.RegisterAttached<AssignBindingTestControl, Control, IBinding?>("AttachedBinding");
[AssignBinding]
public static IBinding? GetAttachedBinding(Control obj)
=> obj.GetValue(AttachedBindingProperty);
public static void SetAttachedBinding(Control obj, IBinding? value)
=> obj.SetValue(AttachedBindingProperty, value);
}
Loading…
Cancel
Save