Skip to content

Allow [AssignBinding] on attached properties #18425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Avalonia.Base/Data/AssignBindingAttribute.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,12 +204,11 @@ class XamlIlAvaloniaProperty : XamlAstClrProperty, IXamlIlAvaloniaProperty
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));

Expand Down Expand Up @@ -459,7 +458,7 @@ sealed class XamlIlAvaloniaClassProperty : XamlAstClrProperty,

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;
Expand Down
62 changes: 62 additions & 0 deletions tests/Avalonia.Markup.Xaml.UnitTests/Xaml/AssignBindingTests.cs
Original file line number Diff line number Diff line change
@@ -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