Skip to content

Commit 60ab70a

Browse files
danwalmsleydanwalmsley
committed
Merge pull request #5852 from AvaloniaUI/fixes/batch-update-default-value
Correctly handle default values in batch update notifications.
1 parent 4336ec9 commit 60ab70a

File tree

6 files changed

+71
-8
lines changed

6 files changed

+71
-8
lines changed

‎src/Avalonia.Base/Data/Optional.cs

+14
Original file line numberDiff line numberDiff line change
@@ -153,4 +153,18 @@ public TResult GetValueOrDefault<TResult>([AllowNull] TResult defaultValue)
153153
/// </summary>
154154
public static Optional<T> Empty => default;
155155
}
156+
157+
public static class OptionalExtensions
158+
{
159+
/// <summary>
160+
/// Casts the type of an <see cref="Optional{T}"/> using only the C# cast operator.
161+
/// </summary>
162+
/// <typeparam name="T">The target type.</typeparam>
163+
/// <param name="value">The binding value.</param>
164+
/// <returns>The cast value.</returns>
165+
public static Optional<T> Cast<T>(this Optional<object> value)
166+
{
167+
return value.HasValue ? new Optional<T>((T)value.Value) : Optional<T>.Empty;
168+
}
169+
}
156170
}

‎src/Avalonia.Base/PropertyStore/BindingEntry.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ public void RaiseValueChanged(
127127
sink.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
128128
owner,
129129
(AvaloniaProperty<T>)property,
130-
oldValue.GetValueOrDefault<T>(),
131-
newValue.GetValueOrDefault<T>(),
130+
oldValue.Cast<T>(),
131+
newValue.Cast<T>(),
132132
Priority));
133133
}
134134

‎src/Avalonia.Base/PropertyStore/ConstantValueEntry.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ public void RaiseValueChanged(
6565
sink.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
6666
owner,
6767
(AvaloniaProperty<T>)property,
68-
oldValue.GetValueOrDefault<T>(),
69-
newValue.GetValueOrDefault<T>(),
68+
oldValue.Cast<T>(),
69+
newValue.Cast<T>(),
7070
Priority));
7171
}
7272
}

‎src/Avalonia.Base/PropertyStore/LocalValueEntry.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ public void RaiseValueChanged(
3636
sink.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
3737
owner,
3838
(AvaloniaProperty<T>)property,
39-
oldValue.GetValueOrDefault<T>(),
40-
newValue.GetValueOrDefault<T>(),
39+
oldValue.Cast<T>(),
40+
newValue.Cast<T>(),
4141
BindingPriority.LocalValue));
4242
}
4343
}

‎src/Avalonia.Base/PropertyStore/PriorityValue.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@ public void RaiseValueChanged(
197197
sink.ValueChanged(new AvaloniaPropertyChangedEventArgs<T>(
198198
owner,
199199
(AvaloniaProperty<T>)property,
200-
oldValue.GetValueOrDefault<T>(),
201-
newValue.GetValueOrDefault<T>(),
200+
oldValue.Cast<T>(),
201+
newValue.Cast<T>(),
202202
Priority));
203203
}
204204

‎tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_BatchUpdate.cs

+49
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.Reactive.Linq;
66
using System.Text;
77
using Avalonia.Data;
8+
using Avalonia.Layout;
89
using Xunit;
910

1011
namespace Avalonia.Base.UnitTests
@@ -104,6 +105,25 @@ public void SetValue_Change_Should_Be_Raised_After_Batch_Update_2()
104105
Assert.Equal("baz", target.Foo);
105106
}
106107

108+
[Fact]
109+
public void SetValue_Change_Should_Be_Raised_After_Batch_Update_3()
110+
{
111+
var target = new TestClass();
112+
var raised = new List<AvaloniaPropertyChangedEventArgs>();
113+
114+
target.PropertyChanged += (s, e) => raised.Add(e);
115+
116+
target.BeginBatchUpdate();
117+
target.SetValue(TestClass.BazProperty, Orientation.Horizontal, BindingPriority.LocalValue);
118+
target.EndBatchUpdate();
119+
120+
Assert.Equal(1, raised.Count);
121+
Assert.Equal(TestClass.BazProperty, raised[0].Property);
122+
Assert.Equal(Orientation.Vertical, raised[0].OldValue);
123+
Assert.Equal(Orientation.Horizontal, raised[0].NewValue);
124+
Assert.Equal(Orientation.Horizontal, target.Baz);
125+
}
126+
107127
[Fact]
108128
public void SetValue_Changes_Should_Be_Raised_In_Correct_Order_After_Batch_Update()
109129
{
@@ -234,6 +254,26 @@ public void Binding_Change_Should_Be_Raised_After_Batch_Update_2()
234254
Assert.Equal("baz", raised[0].NewValue);
235255
}
236256

257+
[Fact]
258+
public void Binding_Change_Should_Be_Raised_After_Batch_Update_3()
259+
{
260+
var target = new TestClass();
261+
var observable = new TestObservable<Orientation>(Orientation.Horizontal);
262+
var raised = new List<AvaloniaPropertyChangedEventArgs>();
263+
264+
target.PropertyChanged += (s, e) => raised.Add(e);
265+
266+
target.BeginBatchUpdate();
267+
target.Bind(TestClass.BazProperty, observable, BindingPriority.LocalValue);
268+
target.EndBatchUpdate();
269+
270+
Assert.Equal(1, raised.Count);
271+
Assert.Equal(TestClass.BazProperty, raised[0].Property);
272+
Assert.Equal(Orientation.Vertical, raised[0].OldValue);
273+
Assert.Equal(Orientation.Horizontal, raised[0].NewValue);
274+
Assert.Equal(Orientation.Horizontal, target.Baz);
275+
}
276+
237277
[Fact]
238278
public void Binding_Completion_Should_Be_Raised_After_Batch_Update()
239279
{
@@ -579,6 +619,9 @@ public class TestClass : AvaloniaObject
579619
public static readonly StyledProperty<string> BarProperty =
580620
AvaloniaProperty.Register<TestClass, string>(nameof(Bar));
581621

622+
public static readonly StyledProperty<Orientation> BazProperty =
623+
AvaloniaProperty.Register<TestClass, Orientation>(nameof(Bar), Orientation.Vertical);
624+
582625
public string Foo
583626
{
584627
get => GetValue(FooProperty);
@@ -590,6 +633,12 @@ public string Bar
590633
get => GetValue(BarProperty);
591634
set => SetValue(BarProperty, value);
592635
}
636+
637+
public Orientation Baz
638+
{
639+
get => GetValue(BazProperty);
640+
set => SetValue(BazProperty, value);
641+
}
593642
}
594643

595644
public class TestObservable<T> : ObservableBase<BindingValue<T>>

0 commit comments

Comments
 (0)