Fixed BindOnChanged issue.

JordanMarr · Apr 13, 2024 · f4b652a · f4b652a
1 parent 46fe03c
commit f4b652a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 19 deletions.
diff --git a/src/ReactiveElmish/ReactiveElmishStore.fs b/src/ReactiveElmish/ReactiveElmishStore.fs
@@ -14,9 +14,6 @@ type IStore<'Model, 'Msg> =
     inherit IStore<'Model>
     abstract member Dispatch: 'Msg -> unit
 
-type IHasSubject<'Model> =
-    abstract member Subject: Subject<'Model> with get
-
 module Design = 
     /// Stubs a constructor injected dependency in design mode.
     let stub<'T> = Unchecked.defaultof<'T>
@@ -32,10 +29,7 @@ type ReactiveElmishStore<'Model, 'Msg> () =
         member this.Dispatch msg = _dispatch msg
         member this.Model = _model
         member this.Observable = _modelSubject.AsObservable()        
-
-    interface IHasSubject<'Model> with
-        member this.Subject = _modelSubject
-
+
     member this.Dispatcher
         with get() = _dispatch
         and set(dispatch) = _dispatch <- dispatch

diff --git a/src/ReactiveElmish/ReactiveElmishViewModel.fs b/src/ReactiveElmish/ReactiveElmishViewModel.fs
@@ -43,12 +43,12 @@ type ReactiveElmishViewModel(onPropertyChanged: string -> unit) =
             // Creates a subscription to the 'Model projection and stores it in a dictionary.
             let disposable = 
                 store.Observable
-                    .DistinctUntilChanged(modelProjection)
+                    .DistinctUntilChanged(modelProjection)                    
                     .Subscribe(fun _ -> 
                         // Alerts the view that the 'Model projection / VM property has changed.
                         onPropertyChanged(vmPropertyName)
                         #if DEBUG
-                        printfn $"PropertyChanged: {vmPropertyName} by {this}"
+                        printfn $"PropertyChanged: {vmPropertyName}"
                         #endif
                     )
             propertySubscriptions.Add(vmPropertyName, disposable)
@@ -75,16 +75,10 @@ type ReactiveElmishViewModel(onPropertyChanged: string -> unit) =
                         // Alerts the view that the 'Model projection / VM property has changed.
                         onPropertyChanged(vmPropertyName)
                         #if DEBUG
-                        printfn $"PropertyChanged: {vmPropertyName} by {this}"
+                        printfn $"PropertyChanged: {vmPropertyName}"
                         #endif
                     )
 
-            match store with
-            | :? IHasSubject<'Model> as subject ->
-                subject.Subject.OnNext(store.Model) // prime the pump
-            | _ ->
-                failwith "BindOnChanged requires the store to implement ISubject<'Model>"
-
             propertySubscriptions.Add(vmPropertyName, disposable)
 
         modelProjection store.Model

diff --git a/src/ReactiveElmish/ReactiveStore.fs b/src/ReactiveElmish/ReactiveStore.fs
@@ -26,9 +26,6 @@ type ReactiveStore<'Model>(init: 'Model) =
         _model <- fn _model
         _modelSubject.OnNext(_model)
 
-    interface IHasSubject<'Model> with
-        member this.Subject = _modelSubject
-
     interface IDisposable with
         member this.Dispose() =
             _modelSubject.Dispose()