feature: Added non type specific ReactivePopupPage

Author: RLittlesII

src/ReactiveUI.Plugins.Popup/ReactivePopupPage.cs

@@ -13,7 +13,7 @@ namespace RxUI.Plugins.Popup
     /// Base Popup page for that implements <see cref="IViewFor"/>.
     /// </summary>
     /// <typeparam name="TViewModel">The view model type.</typeparam>
-    public abstract class ReactivePopupPage<TViewModel> : PopupPage, IViewFor<TViewModel>
+    public abstract class ReactivePopupPage<TViewModel> : ReactivePopupPage, IViewFor<TViewModel>
         where TViewModel : class
     {
         /// <summary>
@@ -31,29 +31,6 @@ public abstract class ReactivePopupPage<TViewModel> : PopupPage, IViewFor<TViewM
             (BindableProperty.CoerceValueDelegate)null,
             (BindableProperty.CreateDefaultValueDelegate)null);
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReactivePopupPage{TViewModel}"/> class.
-        /// </summary>
-        protected ReactivePopupPage()
-        {
-            BackgroundClick =
-                Observable.FromEvent<EventHandler, Unit>(
-                    handler =>
-                    {
-                        void EventHandler(object sender, EventArgs args) => handler(Unit.Default);
-                        return EventHandler;
-                    },
-                    x => BackgroundClicked += x,
-                    x => BackgroundClicked -= x)
-                    .Select(_ => Unit.Default);
-        }
-
-        /// <summary>
-        /// Gets or sets the background click observable signal.
-        /// </summary>
-        /// <value>The background click.</value>
-        public IObservable<Unit> BackgroundClick { get; protected set; }
-
         /// <summary>
         /// Gets or sets the ViewModel corresponding to this specific View.
         /// This should be a BindableProperty if you're using XAML.
@@ -70,7 +47,7 @@ object IViewFor.ViewModel
         public TViewModel ViewModel
         {
             get => (TViewModel)GetValue(ViewModelProperty);
-            set => SetValue(ViewModelProperty, (object)value);
+            set => SetValue(ViewModelProperty, value);
         }
 
         /// <summary>
@@ -90,4 +67,74 @@ private static void OnViewModelChanged(BindableObject bindableObject, object old
             bindableObject.BindingContext = newValue;
         }
     }
+
+    /// <summary>
+    /// Base Popup page for that implements <see cref="IViewFor"/>.
+    /// </summary>
+    public abstract class ReactivePopupPage : PopupPage, IViewFor
+    {
+        /// <summary>
+        /// The view model property.
+        /// </summary>
+        public static readonly BindableProperty ViewModelProperty = BindableProperty.Create(
+            nameof(ViewModel),
+            typeof(object),
+            typeof(IViewFor<object>),
+            (object)null,
+            BindingMode.OneWay,
+            (BindableProperty.ValidateValueDelegate)null,
+            new BindableProperty.BindingPropertyChangedDelegate(OnViewModelChanged),
+            (BindableProperty.BindingPropertyChangingDelegate)null,
+            (BindableProperty.CoerceValueDelegate)null,
+            (BindableProperty.CreateDefaultValueDelegate)null);
+
+        /// <summary>
+        /// Gets or sets the background click observable signal.
+        /// </summary>
+        /// <value>The background click.</value>
+        public IObservable<Unit> BackgroundClick { get; protected set; }
+
+        /// <summary>
+        /// Gets or sets the ViewModel to display.
+        /// </summary>
+        public object ViewModel
+        {
+            get => GetValue(ViewModelProperty);
+            set => SetValue(ViewModelProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the control binding disposable.
+        /// </summary>
+        protected CompositeDisposable ControlBindings { get; } = new CompositeDisposable();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ReactivePopupPage{TViewModel}"/> class.
+        /// </summary>
+        protected ReactivePopupPage()
+        {
+            BackgroundClick =
+                Observable.FromEvent<EventHandler, Unit>(
+                        handler =>
+                        {
+                            void EventHandler(object sender, EventArgs args) => handler(Unit.Default);
+                            return EventHandler;
+                        },
+                        x => BackgroundClicked += x,
+                        x => BackgroundClicked -= x)
+                    .Select(_ => Unit.Default);
+        }
+
+        /// <inheritdoc/>
+        protected override void OnBindingContextChanged()
+        {
+            base.OnBindingContextChanged();
+            ViewModel = BindingContext;
+        }
+
+        private static void OnViewModelChanged(BindableObject bindableObject, object oldValue, object newValue)
+        {
+            bindableObject.BindingContext = newValue;
+        }
+    }
 }