Remove internal System.Reactive usage. Only keep old visible API to avoid breaking changes.

Author: maxkatz6

src/Avalonia.Controls.TreeDataGrid/Avalonia.Controls.TreeDataGrid.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
-    
-    <PackageReference Include="System.Reactive" Version="5.0.0" />
+
+    <PackageReference Include="System.Reactive" Version="6.0.0" />
   </ItemGroup>
 </Project>

src/Avalonia.Controls.TreeDataGrid/Experimental/Data/Core/TypedBindingExpression`2.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Reactive.Subjects;
 using Avalonia.Data;
+using Avalonia.Reactive;
 using Avalonia.Utilities;
 
 #nullable enable
@@ -19,7 +19,7 @@ namespace Avalonia.Experimental.Data.Core
     /// instantiated on an object.
     /// </remarks>
     public class TypedBindingExpression<TIn, TOut> : LightweightObservableBase<BindingValue<TOut>>,
-        ISubject<BindingValue<TOut>>,
+        IObserver<BindingValue<TOut>>,
         IDescription
             where TIn : class
     {
@@ -91,7 +91,7 @@ void IObserver<BindingValue<TOut>>.OnError(Exception error)
         protected override void Initialize()
         {
             _flags &= ~Flags.RootHasFired;
-            _rootSourceSubsciption = _rootSource.Subscribe(RootChanged);
+            _rootSourceSubsciption = _rootSource.Subscribe(new AnonymousObserver<TIn?>(RootChanged));
             _flags |= Flags.Initialized;
         }
 

src/Avalonia.Controls.TreeDataGrid/Experimental/Data/ObservableEx.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Reactive.Disposables;
+using Avalonia.Experimental.Data.Core;
 
 namespace Avalonia.Experimental.Data
 {

src/Avalonia.Controls.TreeDataGrid/Experimental/Data/TypedBinding`2.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Reactive.Disposables;
 using Avalonia.Data;
 using Avalonia.Experimental.Data.Core;
 using Avalonia.Reactive;

src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/CheckBoxCell.cs

@@ -1,13 +1,12 @@
 using System;
-using System.Reactive.Subjects;
-using System.Reflection;
 using Avalonia.Data;
+using Avalonia.Reactive;
 
 namespace Avalonia.Controls.Models.TreeDataGrid
 {
     public class CheckBoxCell : NotifyingBase, ICell, IDisposable
     {
-        private readonly ISubject<BindingValue<bool?>>? _binding;
+        private readonly IObserver<BindingValue<bool?>>? _binding;
         private readonly IDisposable? _subscription;
         private bool? _value;
 
@@ -18,19 +17,29 @@ public CheckBoxCell(bool? value)
         }
 
         public CheckBoxCell(
-            ISubject<BindingValue<bool?>> binding,
+            IObserver<BindingValue<bool?>> bindingObserver,
+            IObservable<BindingValue<bool?>> bindingObservable,
             bool isReadOnly,
             bool isThreeState)
         {
-            _binding = binding;
+            _binding = bindingObserver;
             IsReadOnly = isReadOnly;
             IsThreeState = isThreeState;
 
-            _subscription = binding.Subscribe(x =>
+            _subscription = bindingObservable.Subscribe(new AnonymousObserver<BindingValue<bool?>>(x =>
             {
                 if (x.HasValue)
                     Value = x.Value;
-            });
+            }));
+        }
+
+        [Obsolete("ISubject<> might be removed in the future versions.")]
+        public CheckBoxCell(
+            System.Reactive.Subjects.ISubject<BindingValue<bool?>> binding,
+            bool isReadOnly,
+            bool isThreeState)
+            : this(binding, binding, isReadOnly, isThreeState)
+        {
         }
 
         public bool CanEdit => false;

src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/CheckBoxColumn.cs

@@ -68,7 +68,8 @@ public CheckBoxColumn(
 
         public override ICell CreateCell(IRow<TModel> row)
         {
-            return new CheckBoxCell(CreateBindingExpression(row.Model), Binding.Write is null, IsThreeState);
+            var expression = CreateBindingExpression(row.Model);
+            return new CheckBoxCell(expression, expression, Binding.Write is null, IsThreeState);
         }
 
         private static Func<TModel, bool?> ToNullable(Expression<Func<TModel, bool>> getter)

src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/ColumnBase`2.cs

@@ -4,7 +4,6 @@
 using System.Linq.Expressions;
 using Avalonia.Experimental.Data;
 using Avalonia.Experimental.Data.Core;
-using Avalonia.Reactive;
 
 namespace Avalonia.Controls.Models.TreeDataGrid
 {

src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/ExpanderCell.cs

@@ -1,8 +1,8 @@
 using System;
 using System.ComponentModel;
-using System.Reactive.Disposables;
 using Avalonia.Data;
 using Avalonia.Experimental.Data.Core;
+using Avalonia.Reactive;
 
 namespace Avalonia.Controls.Models.TreeDataGrid
 {
@@ -12,7 +12,7 @@ public class ExpanderCell<TModel> : NotifyingBase,
         where TModel : class
     {
         private readonly ICell _inner;
-        private readonly CompositeDisposable _subscription = new();
+        private readonly IDisposable _subscription;
 
         public ExpanderCell(
             ICell inner,
@@ -24,15 +24,19 @@ public ExpanderCell(
             Row = row;
             row.PropertyChanged += RowPropertyChanged;
 
-            _subscription.Add(showExpander.Subscribe(x => Row.UpdateShowExpander(this, x)));
-
+            var expanderSubscription = showExpander.Subscribe(new AnonymousObserver<bool>(x => Row.UpdateShowExpander(this, x)));
             if (isExpanded is not null)
             {
-                _subscription.Add(isExpanded.Subscribe(x =>
+                var isExpandedSubscription = isExpanded.Subscribe(new AnonymousObserver<BindingValue<bool>>(x =>
                 {
                     if (x.HasValue)
                         IsExpanded = x.Value;
                 }));
+                _subscription = new CompositeDisposable(expanderSubscription, isExpandedSubscription);
+            }
+            else
+            {
+                _subscription = expanderSubscription;
             }
         }
 

src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TextCell.cs

@@ -2,15 +2,15 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
-using System.Reactive.Subjects;
 using Avalonia.Data;
 using Avalonia.Media;
+using Avalonia.Reactive;
 
 namespace Avalonia.Controls.Models.TreeDataGrid
 {
     public class TextCell<T> : NotifyingBase, ITextCell, IDisposable, IEditableObject
     {
-        private readonly ISubject<BindingValue<T>>? _binding;
+        private readonly IObserver<BindingValue<T>>? _binding;
         private readonly IDisposable? _subscription;
         [AllowNull] private T? _value;
         [AllowNull] private T? _cancelValue;
@@ -24,19 +24,29 @@ public TextCell(T? value)
         }
 
         public TextCell(
-            ISubject<BindingValue<T>> binding,
+            IObserver<BindingValue<T>> bindingSubject,
+            IObservable<BindingValue<T>> bindingObservable,
             bool isReadOnly,
             ITextCellOptions? options = null)
         {
-            _binding = binding;
+            _binding = bindingSubject;
             IsReadOnly = isReadOnly;
             _options = options;
 
-            _subscription = binding.Subscribe(x =>
+            _subscription = bindingObservable.Subscribe(new AnonymousObserver<BindingValue<T>>(x =>
             {
                 if (x.HasValue)
                     Value = x.Value;
-            });
+            }));
+        }
+
+        [Obsolete("ISubject<> might be removed in the future versions.")]
+        public TextCell(
+            System.Reactive.Subjects.ISubject<BindingValue<T>> binding,
+            bool isReadOnly,
+            ITextCellOptions? options = null)
+            : this(binding, binding, isReadOnly, options)
+        {
         }
 
         public bool CanEdit => !IsReadOnly;

src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TextColumn.cs

@@ -62,7 +62,8 @@ public TextColumn(
 
         public override ICell CreateCell(IRow<TModel> row)
         {
-            return new TextCell<TValue?>(CreateBindingExpression(row.Model), Binding.Write is null, Options);
+            var expression = CreateBindingExpression(row.Model);
+            return new TextCell<TValue?>(expression, expression, Binding.Write is null, Options);
         }
 
         string? ITextSearchableColumn<TModel>.SelectValue(TModel model)