Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 27 additions & 20 deletions src/ReactiveUI.Blazor/ReactiveComponentBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
using System.Reactive;
using System.Reactive.Disposables;
using System.Reactive.Linq;
using System.Reactive.Subjects;
using System.Runtime.CompilerServices;
Expand Down Expand Up @@ -79,30 +80,37 @@ protected override void OnInitialized()
base.OnInitialized();
}

/// <inheritdoc />
protected override void OnAfterRender(bool isFirstRender)
/// <inheritdoc/>
protected override void OnAfterRender(bool firstRender)
{
if (isFirstRender)
if (firstRender)
{
this.WhenAnyValue(x => x.ViewModel)
.Skip(1)
.Where(x => x != null)
// The following subscriptions are here because if they are done in OnInitialized, they conflict with certain JavaScript frameworks.
var viewModelChanged =
this.WhenAnyValue(x => x.ViewModel)
.Where(x => x != null)
.Publish()
.RefCount();

viewModelChanged
.Subscribe(_ => InvokeAsync(StateHasChanged));

viewModelChanged
.Select(x =>
Observable
.FromEvent<PropertyChangedEventHandler, Unit>(
eventHandler =>
{
void Handler(object sender, PropertyChangedEventArgs e) => eventHandler(Unit.Default);
return Handler;
},
eh => x.PropertyChanged += eh,
eh => x.PropertyChanged -= eh))
.Switch()
.Subscribe(_ => InvokeAsync(StateHasChanged));
}

this.WhenAnyValue(x => x.ViewModel)
.Where(x => x != null)
.Select(x => Observable.FromEvent<PropertyChangedEventHandler, Unit>(
eventHandler =>
{
void Handler(object sender, PropertyChangedEventArgs e) => eventHandler(Unit.Default);
return Handler;
},
eh => x.PropertyChanged += eh,
eh => x.PropertyChanged -= eh))
.Switch()
.Do(_ => InvokeAsync(StateHasChanged))
.Subscribe();
base.OnAfterRender(firstRender);
}

/// <summary>
Expand All @@ -125,7 +133,6 @@ protected virtual void Dispose(bool disposing)
if (disposing)
{
_initSubject?.Dispose();

_deactivateSubject.OnNext(Unit.Default);
}

Expand Down