Skip to content

Fix OneWayBind converter #2472

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.

Sign up for GitHub

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 2 commits into from
Jul 30, 2020
Merged

Fix OneWayBind converter #2472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e58e1b2
Add missing test
kronic Jul 30, 2020
d5a7d1f
Fix bind OneWayBind converter
kronic Jul 30, 2020
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
7 changes: 7 additions & 0 deletions src/ReactiveUI.Tests/Mocks/PropertyBindViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public class PropertyBindViewModel : ReactiveObject
private decimal _JustADecimal;
private double? _NullableDouble;
private int _JustAInt32;
private bool _JustABoolean;

public PropertyBindViewModel(PropertyBindModel? model = null)
{
Expand All @@ -46,6 +47,12 @@ public double JustADouble
set => this.RaiseAndSetIfChanged(ref _JustADouble, value);
}

public bool JustABoolean
{
get => _JustABoolean;
set => this.RaiseAndSetIfChanged(ref _JustABoolean, value);
}

public decimal JustADecimal
{
get => _JustADecimal;
Expand Down
10 changes: 10 additions & 0 deletions src/ReactiveUI.Tests/Platforms/windows-xaml/PropertyBindingTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,16 @@ public void BindingToItemsControl()
Assert.True(itemsSourceValue.OfType<string>().Count() > 1);
}

[Fact]
public void OneWayBindConverter()
{
var vm = new PropertyBindViewModel();
var view = new PropertyBindView { ViewModel = vm };
var fixture = new PropertyBinderImplementation();
fixture.OneWayBind(vm, view, x => x.JustABoolean, x => x.SomeTextBox.IsEnabled, s => s);
Assert.False(view.SomeTextBox.IsEnabled);
}

[Fact]
public void BindExpectsConverterFuncsToNotBeNull()
{
Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveUI/Bindings/Property/PropertyBinderImplementation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ bool ViewToVmFunc(TVProp vValue, out TVMProp vmValue)
return null;
}

IObservable<object?> source = (IObservable<object?>)Reflection.ViewModelWhenAnyValue(viewModel, view, vmExpression).Select(x => (TProp)x).Select(selector);
IObservable<object?> source = Reflection.ViewModelWhenAnyValue(viewModel, view, vmExpression).Select(x => (object?)selector((TProp)x));

var (disposable, obs) = BindToDirect<TView, TOut, TOut>(source, view, viewExpression);

Expand Down