From d2be495bdecb5f249ff8855d6921fb14ba185a82 Mon Sep 17 00:00:00 2001 From: artyom Date: Sun, 21 Oct 2018 20:56:55 +0300 Subject: [PATCH 1/2] Add ReactiveUserControl and ReactiveWindow --- .../ReactiveUserControl.cs | 45 ++++++++++ src/Avalonia.ReactiveUI/ReactiveWindow.cs | 45 ++++++++++ .../AvaloniaActivationForViewFetcherTest.cs | 82 ++++++++++++++++--- 3 files changed, 162 insertions(+), 10 deletions(-) create mode 100644 src/Avalonia.ReactiveUI/ReactiveUserControl.cs create mode 100644 src/Avalonia.ReactiveUI/ReactiveWindow.cs diff --git a/src/Avalonia.ReactiveUI/ReactiveUserControl.cs b/src/Avalonia.ReactiveUI/ReactiveUserControl.cs new file mode 100644 index 0000000000..5df6399c38 --- /dev/null +++ b/src/Avalonia.ReactiveUI/ReactiveUserControl.cs @@ -0,0 +1,45 @@ +// Copyright (c) The Avalonia Project. All rights reserved. +// Licensed under the MIT license. See licence.md file in the project root for full license information. + +using Avalonia; +using Avalonia.VisualTree; +using Avalonia.Controls; +using ReactiveUI; + +namespace Avalonia +{ + /// + /// A ReactiveUI UserControl that implements + /// and will activate your ViewModel automatically if it supports activation. + /// + /// ViewModel type. + public class ReactiveUserControl : UserControl, IViewFor where TViewModel : class + { + public static readonly AvaloniaProperty ViewModelProperty = AvaloniaProperty + .Register, TViewModel>(nameof(ViewModel)); + + /// + /// Initializes a new instance of the class. + /// + public ReactiveUserControl() + { + DataContextChanged += (sender, args) => ViewModel = DataContext as TViewModel; + this.WhenActivated(disposables => { /* activate ViewModel */ }); + } + + /// + /// The ViewModel. + /// + public TViewModel ViewModel + { + get => GetValue(ViewModelProperty); + set => SetValue(ViewModelProperty, value); + } + + object IViewFor.ViewModel + { + get => ViewModel; + set => ViewModel = (TViewModel)value; + } + } +} \ No newline at end of file diff --git a/src/Avalonia.ReactiveUI/ReactiveWindow.cs b/src/Avalonia.ReactiveUI/ReactiveWindow.cs new file mode 100644 index 0000000000..c8b0c59d67 --- /dev/null +++ b/src/Avalonia.ReactiveUI/ReactiveWindow.cs @@ -0,0 +1,45 @@ +// Copyright (c) The Avalonia Project. All rights reserved. +// Licensed under the MIT license. See licence.md file in the project root for full license information. + +using Avalonia; +using Avalonia.VisualTree; +using Avalonia.Controls; +using ReactiveUI; + +namespace Avalonia +{ + /// + /// A ReactiveUI Window that implements + /// and will activate your ViewModel automatically if it supports activation. + /// + /// ViewModel type. + public class ReactiveWindow : Window, IViewFor where TViewModel : class + { + public static readonly AvaloniaProperty ViewModelProperty = AvaloniaProperty + .Register, TViewModel>(nameof(ViewModel)); + + /// + /// Initializes a new instance of the class. + /// + public ReactiveWindow() + { + DataContextChanged += (sender, args) => ViewModel = DataContext as TViewModel; + this.WhenActivated(disposables => { /* activate ViewModel */ }); + } + + /// + /// The ViewModel. + /// + public TViewModel ViewModel + { + get => GetValue(ViewModelProperty); + set => SetValue(ViewModelProperty, value); + } + + object IViewFor.ViewModel + { + get => ViewModel; + set => ViewModel = (TViewModel)value; + } + } +} \ No newline at end of file diff --git a/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs index bda55276a8..cdf19c067d 100644 --- a/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs +++ b/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs @@ -23,7 +23,8 @@ namespace Avalonia public TestUserControlWithWhenActivated() { - this.WhenActivated(disposables => { + this.WhenActivated(disposables => + { Active = true; Disposable .Create(() => Active = false) @@ -38,7 +39,8 @@ namespace Avalonia public TestWindowWithWhenActivated() { - this.WhenActivated(disposables => { + this.WhenActivated(disposables => + { Active = true; Disposable .Create(() => Active = false) @@ -47,6 +49,42 @@ namespace Avalonia } } + public class ActivatableViewModel : ISupportsActivation + { + public ViewModelActivator Activator { get; } + + public bool IsActivated { get; private set; } + + public ActivatableViewModel() + { + Activator = new ViewModelActivator(); + this.WhenActivated(disposables => + { + IsActivated = true; + Disposable + .Create(() => IsActivated = false) + .DisposeWith(disposables); + }); + } + } + + public class ActivatableWindow : ReactiveWindow + { + public ActivatableWindow() { } + } + + public class ActivatableUserControl : ReactiveUserControl + { + public ActivatableUserControl() { } + } + + public AvaloniaActivationForViewFetcherTest() + { + Locator.CurrentMutable.RegisterConstant( + new AvaloniaActivationForViewFetcher(), + typeof(IActivationForViewFetcher)); + } + [Fact] public void Visual_Element_Is_Activated_And_Deactivated() { @@ -86,10 +124,6 @@ namespace Avalonia [Fact] public void Activation_For_View_Fetcher_Should_Support_When_Activated() { - Locator.CurrentMutable.RegisterConstant( - new AvaloniaActivationForViewFetcher(), - typeof(IActivationForViewFetcher)); - var userControl = new TestUserControlWithWhenActivated(); Assert.False(userControl.Active); @@ -104,10 +138,6 @@ namespace Avalonia [Fact] public void Activation_For_View_Fetcher_Should_Support_Windows() { - Locator.CurrentMutable.RegisterConstant( - new AvaloniaActivationForViewFetcher(), - typeof(IActivationForViewFetcher)); - using (var application = UnitTestApplication.Start(TestServices.MockWindowingPlatform)) { var window = new TestWindowWithWhenActivated(); @@ -120,5 +150,37 @@ namespace Avalonia Assert.False(window.Active); } } + + [Fact] + public void Activatable_Window_View_Model_Is_Activated_And_Deactivated() + { + using (var application = UnitTestApplication.Start(TestServices.MockWindowingPlatform)) + { + var viewModel = new ActivatableViewModel(); + var window = new ActivatableWindow { ViewModel = viewModel }; + Assert.False(viewModel.IsActivated); + + window.Show(); + Assert.True(viewModel.IsActivated); + + window.Close(); + Assert.False(viewModel.IsActivated); + } + } + + [Fact] + public void Activatable_User_Control_View_Model_Is_Activated_And_Deactivated() + { + var root = new TestRoot(); + var viewModel = new ActivatableViewModel(); + var control = new ActivatableUserControl { ViewModel = viewModel }; + Assert.False(viewModel.IsActivated); + + root.Child = control; + Assert.True(viewModel.IsActivated); + + root.Child = null; + Assert.False(viewModel.IsActivated); + } } } \ No newline at end of file From 3aabd354ade22470f6c233e92ef77f668ae0f676 Mon Sep 17 00:00:00 2001 From: artyom Date: Tue, 23 Oct 2018 00:29:29 +0300 Subject: [PATCH 2/2] Use activation behavior like on other XAML platforms --- src/Avalonia.ReactiveUI/ReactiveUserControl.cs | 1 - src/Avalonia.ReactiveUI/ReactiveWindow.cs | 1 - .../AvaloniaActivationForViewFetcherTest.cs | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Avalonia.ReactiveUI/ReactiveUserControl.cs b/src/Avalonia.ReactiveUI/ReactiveUserControl.cs index 5df6399c38..04c6f100a6 100644 --- a/src/Avalonia.ReactiveUI/ReactiveUserControl.cs +++ b/src/Avalonia.ReactiveUI/ReactiveUserControl.cs @@ -24,7 +24,6 @@ namespace Avalonia public ReactiveUserControl() { DataContextChanged += (sender, args) => ViewModel = DataContext as TViewModel; - this.WhenActivated(disposables => { /* activate ViewModel */ }); } /// diff --git a/src/Avalonia.ReactiveUI/ReactiveWindow.cs b/src/Avalonia.ReactiveUI/ReactiveWindow.cs index c8b0c59d67..bb50a37764 100644 --- a/src/Avalonia.ReactiveUI/ReactiveWindow.cs +++ b/src/Avalonia.ReactiveUI/ReactiveWindow.cs @@ -24,7 +24,6 @@ namespace Avalonia public ReactiveWindow() { DataContextChanged += (sender, args) => ViewModel = DataContext as TViewModel; - this.WhenActivated(disposables => { /* activate ViewModel */ }); } /// diff --git a/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs index cdf19c067d..b782311729 100644 --- a/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs +++ b/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs @@ -70,12 +70,12 @@ namespace Avalonia public class ActivatableWindow : ReactiveWindow { - public ActivatableWindow() { } + public ActivatableWindow() => this.WhenActivated(disposables => { }); } public class ActivatableUserControl : ReactiveUserControl { - public ActivatableUserControl() { } + public ActivatableUserControl() => this.WhenActivated(disposables => { }); } public AvaloniaActivationForViewFetcherTest()