From bf5adc689b47e5579fd869f73c4509f03f1be734 Mon Sep 17 00:00:00 2001
From: Kazuki Ota <k_ota28@hotmail.com>
Date: Sun, 12 Mar 2023 20:14:21 +0900
Subject: [PATCH 1/2] Remove ToEvent extension methods

---
 .../BlazorSample.Shared/Pages/Counter.razor   | 21 +++++
 .../BlazorSample.Shared/Pages/Index.razor     | 13 ++--
 .../ViewModels/CounterViewModel.cs            | 31 ++++++++
 .../BlazorServerApp/Pages/Counter.razor       | 18 -----
 Samples/Blazor/BlazorServerApp/Program.cs     |  1 +
 .../Blazor/BlazorWasmApp/Pages/Counter.razor  | 18 -----
 Samples/Blazor/BlazorWasmApp/Program.cs       |  1 +
 .../CommandExtensions.cs                      | 76 +------------------
 8 files changed, 62 insertions(+), 117 deletions(-)
 create mode 100644 Samples/Blazor/BlazorSample.Shared/Pages/Counter.razor
 create mode 100644 Samples/Blazor/BlazorSample.Shared/ViewModels/CounterViewModel.cs
 delete mode 100644 Samples/Blazor/BlazorServerApp/Pages/Counter.razor
 delete mode 100644 Samples/Blazor/BlazorWasmApp/Pages/Counter.razor

diff --git a/Samples/Blazor/BlazorSample.Shared/Pages/Counter.razor b/Samples/Blazor/BlazorSample.Shared/Pages/Counter.razor
new file mode 100644
index 00000000..e9be5291
--- /dev/null
+++ b/Samples/Blazor/BlazorSample.Shared/Pages/Counter.razor
@@ -0,0 +1,21 @@
+@page "/counter"
+@using Reactive.Bindings
+@implements IDisposable
+@inject CounterViewModel CounterViewModel
+
+<PageTitle>Counter</PageTitle>
+
+<h1>Counter</h1>
+
+<p role="status">Current count: @CounterViewModel.Counter.Value</p>
+
+<button class="btn btn-primary"
+        @onclick="() => CounterViewModel.IncrementCommand.Execute()"
+        disabled="@CounterViewModel.IncrementCommand.IsDisabled()"
+        type="button">
+    Click me
+</button>
+
+@code {
+    public void Dispose() => CounterViewModel.Dispose();
+}
\ No newline at end of file
diff --git a/Samples/Blazor/BlazorSample.Shared/Pages/Index.razor b/Samples/Blazor/BlazorSample.Shared/Pages/Index.razor
index 612b2405..017b1aa0 100644
--- a/Samples/Blazor/BlazorSample.Shared/Pages/Index.razor
+++ b/Samples/Blazor/BlazorSample.Shared/Pages/Index.razor
@@ -20,9 +20,12 @@
 
 <h3>Validation sample</h3>
 
-<EditForm Model="ValidationViewModel"
-          OnInvalidSubmit="ValidationViewModel.InvalidSubmitCommand.ToEvent<EditContext>()"
-          OnValidSubmit="ValidationViewModel.SubmitCommand.ToEvent<EditContext>()">
+@*<EditForm Model="ValidationViewModel"
+          OnInvalidSubmit="() => ValidationViewModel.InvalidSubmitCommand.ExecuteAsync()"
+          OnValidSubmit="() => ValidationViewModel.SubmitCommand.ExecuteAsync()">
+*@<EditForm Model="ValidationViewModel"
+          OnInvalidSubmit="() => ValidationViewModel.InvalidSubmitCommand.ExecuteAsync()"
+          OnValidSubmit="() => ValidationViewModel.SubmitCommand.ExecuteAsync()">
     <ReactivePropertiesValidator />
 
     <ValidationSummary />
@@ -59,10 +62,6 @@
     {
         ValidationViewModel.AddTo(_disposable);
         HelloWorldViewModel.AddTo(_disposable);
-
-        HelloWorldViewModel.Output
-            .Subscribe(_ => InvokeAsync(StateHasChanged))
-            .AddTo(_disposable);
     }
 
     public void Dispose() => _disposable.Dispose();
diff --git a/Samples/Blazor/BlazorSample.Shared/ViewModels/CounterViewModel.cs b/Samples/Blazor/BlazorSample.Shared/ViewModels/CounterViewModel.cs
new file mode 100644
index 00000000..e30762ef
--- /dev/null
+++ b/Samples/Blazor/BlazorSample.Shared/ViewModels/CounterViewModel.cs
@@ -0,0 +1,31 @@
+using System.Reactive.Disposables;
+using Reactive.Bindings;
+using Reactive.Bindings.Extensions;
+using Reactive.Bindings.TinyLinq;
+
+namespace BlazorSample.Shared.ViewModels;
+public class CounterViewModel : IDisposable
+{
+    private CompositeDisposable _disposables = new();
+    public ReactivePropertySlim<int> Counter { get; }
+
+    public ReactiveCommandSlim IncrementCommand { get; }
+
+    public CounterViewModel()
+    {
+        Counter = new ReactivePropertySlim<int>(0)
+            .AddTo(_disposables);
+
+        IncrementCommand = Counter.Select(x => x < 10)
+            .ToReactiveCommandSlim()
+            .WithSubscribe(Increment, _disposables.Add)
+            .AddTo(_disposables);
+    }
+
+    private void Increment()
+    {
+        Counter.Value++;
+    }
+
+    public void Dispose() => _disposables.Dispose();
+}
diff --git a/Samples/Blazor/BlazorServerApp/Pages/Counter.razor b/Samples/Blazor/BlazorServerApp/Pages/Counter.razor
deleted file mode 100644
index ef23cb31..00000000
--- a/Samples/Blazor/BlazorServerApp/Pages/Counter.razor
+++ /dev/null
@@ -1,18 +0,0 @@
-@page "/counter"
-
-<PageTitle>Counter</PageTitle>
-
-<h1>Counter</h1>
-
-<p role="status">Current count: @currentCount</p>
-
-<button class="btn btn-primary" @onclick="IncrementCount">Click me</button>
-
-@code {
-    private int currentCount = 0;
-
-    private void IncrementCount()
-    {
-        currentCount++;
-    }
-}
diff --git a/Samples/Blazor/BlazorServerApp/Program.cs b/Samples/Blazor/BlazorServerApp/Program.cs
index ae71739c..7f3fd40b 100644
--- a/Samples/Blazor/BlazorServerApp/Program.cs
+++ b/Samples/Blazor/BlazorServerApp/Program.cs
@@ -11,6 +11,7 @@
 builder.Services.AddSingleton<WeatherForecastService>();
 builder.Services.AddTransient<ValidationViewModel>();
 builder.Services.AddTransient<HelloWorldViewModel>();
+builder.Services.AddTransient<CounterViewModel>();
 
 var app = builder.Build();
 
diff --git a/Samples/Blazor/BlazorWasmApp/Pages/Counter.razor b/Samples/Blazor/BlazorWasmApp/Pages/Counter.razor
deleted file mode 100644
index ef23cb31..00000000
--- a/Samples/Blazor/BlazorWasmApp/Pages/Counter.razor
+++ /dev/null
@@ -1,18 +0,0 @@
-@page "/counter"
-
-<PageTitle>Counter</PageTitle>
-
-<h1>Counter</h1>
-
-<p role="status">Current count: @currentCount</p>
-
-<button class="btn btn-primary" @onclick="IncrementCount">Click me</button>
-
-@code {
-    private int currentCount = 0;
-
-    private void IncrementCount()
-    {
-        currentCount++;
-    }
-}
diff --git a/Samples/Blazor/BlazorWasmApp/Program.cs b/Samples/Blazor/BlazorWasmApp/Program.cs
index 22be29d8..bdab3f5b 100644
--- a/Samples/Blazor/BlazorWasmApp/Program.cs
+++ b/Samples/Blazor/BlazorWasmApp/Program.cs
@@ -9,6 +9,7 @@
 
 builder.Services.AddTransient<ValidationViewModel>();
 builder.Services.AddTransient<HelloWorldViewModel>();
+builder.Services.AddTransient<CounterViewModel>();
 builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 
 await builder.Build().RunAsync();
diff --git a/Source/ReactiveProperty.Platform.Blazor/CommandExtensions.cs b/Source/ReactiveProperty.Platform.Blazor/CommandExtensions.cs
index d423a86d..d106ee4e 100644
--- a/Source/ReactiveProperty.Platform.Blazor/CommandExtensions.cs
+++ b/Source/ReactiveProperty.Platform.Blazor/CommandExtensions.cs
@@ -1,5 +1,4 @@
 using System.Windows.Input;
-using Microsoft.AspNetCore.Components;
 
 namespace Reactive.Bindings;
 
@@ -8,82 +7,11 @@ namespace Reactive.Bindings;
 /// </summary>
 public static class CommandExtensions
 {
-    /// <summary>
-    /// Convert from ReactiveCommand to EventCallback.
-    /// </summary>
-    /// <typeparam name="TValue">The type argument of EventCallback</typeparam>
-    /// <param name="command">The command</param>
-    /// <returns>EventCallback instance</returns>
-    public static EventCallback<TValue> ToEvent<TValue>(this ReactiveCommand command) => new EventCallback<TValue>(null, (TValue _) => command.Execute());
-
-    /// <summary>
-    /// Convert from ReactiveCommand to EventCallback.
-    /// </summary>
-    /// <typeparam name="TValue">The type argument of EventCallback</typeparam>
-    /// <param name="command">The command</param>
-    /// <returns>EventCallback instance</returns>
-    public static EventCallback<TValue> ToEvent<TValue>(this ReactiveCommand<TValue> command) => new EventCallback<TValue>(null, command.Execute);
-
-    /// <summary>
-    /// Convert from ReactiveCommand to EventCallback.
-    /// </summary>
-    /// <typeparam name="TValue">The type argument of EventCallback</typeparam>
-    /// <param name="command">The command</param>
-    /// <returns>EventCallback instance</returns>
-    public static EventCallback<TValue> ToEvent<TValue>(this ReactiveCommandSlim command) => new EventCallback<TValue>(null, (TValue _) => command.Execute());
-
-    /// <summary>
-    /// Convert from ReactiveCommand to EventCallback.
-    /// </summary>
-    /// <typeparam name="TValue">The type argument of EventCallback</typeparam>
-    /// <param name="command">The command</param>
-    /// <returns>EventCallback instance</returns>
-    public static EventCallback<TValue> ToEvent<TValue>(this ReactiveCommandSlim<TValue> command) => new EventCallback<TValue>(null, command.Execute);
-
-    /// <summary>
-    /// Convert from ReactiveCommand to EventCallback.
-    /// </summary>
-    /// <typeparam name="TValue">The type argument of EventCallback</typeparam>
-    /// <param name="command">The command</param>
-    /// <returns>EventCallback instance</returns>
-    public static EventCallback<TValue> ToEvent<TValue>(this AsyncReactiveCommand command) => new EventCallback<TValue>(null, (TValue _) => command.ExecuteAsync());
-
-    /// <summary>
-    /// Convert from ReactiveCommand to EventCallback.
-    /// </summary>
-    /// <typeparam name="TValue">The type argument of EventCallback</typeparam>
-    /// <param name="command">The command</param>
-    /// <returns>EventCallback instance</returns>
-    public static EventCallback<TValue> ToEvent<TValue>(this AsyncReactiveCommand<TValue> command) => new EventCallback<TValue>(null, command.ExecuteAsync);
-
-    /// <summary>
-    /// Convert from ReactiveCommand to EventCallback.
-    /// </summary>
-    /// <param name="command">The command</param>
-    /// <returns>EventCallback instance</returns>
-    public static EventCallback ToEvent(this ReactiveCommand command) => new EventCallback(null, () => command.Execute());
-
-    /// <summary>
-    /// Convert from ReactiveCommand to EventCallback.
-    /// </summary>
-    /// <param name="command">The command</param>
-    /// <returns>EventCallback instance</returns>
-    public static EventCallback ToEvent(this ReactiveCommandSlim command) => new EventCallback(null, () => command.Execute());
-
-    /// <summary>
-    /// Convert from ReactiveCommand to EventCallback.
-    /// </summary>
-    /// <param name="command">The command</param>
-    /// <returns>EventCallback instance</returns>
-    public static EventCallback ToEvent(this AsyncReactiveCommand command) => new EventCallback(null, () => command.ExecuteAsync());
-
     /// <summary>
     /// Return a boolean value that is inverted CanExecute method.
     /// </summary>
     /// <param name="command">The command.</param>
     /// <returns>Inverted value of CanExecute method.</returns>
-    public static bool IsDisabled(this ICommand command)
-    {
-        return !command.CanExecute(null);
-    }
+    public static bool IsDisabled(this ICommand command) => 
+        !command.CanExecute(null);
 }

From c48f11d7dd2c2c442da2b7f023c48c6588efb44d Mon Sep 17 00:00:00 2001
From: Kazuki Ota <k_ota28@hotmail.com>
Date: Sun, 12 Mar 2023 20:14:57 +0900
Subject: [PATCH 2/2] Increment version number to 9.1.2

---
 Source/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props
index 42e373db..703659e7 100644
--- a/Source/Directory.Build.props
+++ b/Source/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <RootNamespace>Reactive.Bindings</RootNamespace>
-    <Version>9.1.1</Version>
+    <Version>9.1.2</Version>
     <Authors>neuecc xin9le okazuki</Authors>
     <PackageProjectUrl>https://github.com/runceel/ReactiveProperty</PackageProjectUrl>
     <PackageTags>rx mvvm async rx-main reactive</PackageTags>