Add AsObservable

Cysharp · Aug 5, 2024 · d682d7f · d682d7f
1 parent e1c2739
commit d682d7f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/R3/BindableReactiveProperty.cs b/src/R3/BindableReactiveProperty.cs
@@ -21,6 +21,7 @@ public interface IReadOnlyBindableReactiveProperty<T> : IReadOnlyBindableReactiv
     IReadOnlyBindableReactiveProperty<T> EnableValidation(Func<T, Exception?> validator);
     IReadOnlyBindableReactiveProperty<T> EnableValidation<TClass>([CallerMemberName] string? propertyName = null!);
     IReadOnlyBindableReactiveProperty<T> EnableValidation(Expression<Func<IReadOnlyBindableReactiveProperty<T>?>> selfSelector);
+    Observable<T> AsObservable();
 }
 
 public interface IBindableReactiveProperty : IReadOnlyBindableReactiveProperty
@@ -317,6 +318,11 @@ IReadOnlyBindableReactiveProperty<T> IReadOnlyBindableReactiveProperty<T>.Enable
         enableNotifyError = true;
         return this;
     }
+
+    public Observable<T> AsObservable()
+    {
+        return this;
+    }
 }
 
 internal sealed class PropertyValidationContext(ValidationContext context, ValidationAttribute[] attributes)

diff --git a/src/R3/ReactivePropertyExtensions.cs b/src/R3/ReactivePropertyExtensions.cs
@@ -1,4 +1,9 @@
-namespace R3;
+using System.Collections;
+using System.ComponentModel;
+using System.Linq.Expressions;
+using System.Runtime.CompilerServices;
+
+namespace R3;
 
 public static class ReactivePropertyExtensions
 {
@@ -30,12 +35,12 @@ public static BindableReactiveProperty<T> ToBindableReactiveProperty<T>(this Obs
         return new BindableReactiveProperty<T>(source, initialValue, equalityComparer);
     }
 
-    public static IBindableReactiveProperty<T> ToReadOnlyBindableReactiveProperty<T>(this Observable<T> source, T initialValue = default!)
+    public static IReadOnlyBindableReactiveProperty<T> ToReadOnlyBindableReactiveProperty<T>(this Observable<T> source, T initialValue = default!)
     {
         return new BindableReactiveProperty<T>(source, initialValue, EqualityComparer<T>.Default);
     }
 
-    public static IBindableReactiveProperty<T> ToReadOnlyBindableReactiveProperty<T>(this Observable<T> source, IEqualityComparer<T>? equalityComparer, T initialValue = default!)
+    public static IReadOnlyBindableReactiveProperty<T> ToReadOnlyBindableReactiveProperty<T>(this Observable<T> source, IEqualityComparer<T>? equalityComparer, T initialValue = default!)
     {
         return new BindableReactiveProperty<T>(source, initialValue, equalityComparer);
     }
@@ -74,3 +79,4 @@ protected override void OnCompletedCore(Result result)
         }
     }
 }
+