Skip to content

Fix Blazor ViewModelActivation #3871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 2, 2024
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
6 changes: 6 additions & 0 deletions src/ReactiveUI.Blazor/ReactiveComponentBase.cs
Original file line number Diff line number Diff line change
@@ -69,6 +69,12 @@ public void Dispose()
/// <inheritdoc />
protected override void OnInitialized()
{
if (ViewModel is IActivatableViewModel avm)
{
Activated.Subscribe(_ => avm.Activator.Activate()).DisposeWith(_compositeDisposable);
Deactivated.Subscribe(_ => avm.Activator.Deactivate());
}

_initSubject.OnNext(Unit.Default);
base.OnInitialized();
}
3 changes: 2 additions & 1 deletion src/ReactiveUI.Blazor/ReactiveInjectableComponentBase.cs
Original file line number Diff line number Diff line change
@@ -69,13 +69,14 @@ public void Dispose()
/// <inheritdoc />
protected override void OnInitialized()
{
_initSubject.OnNext(Unit.Default);
if (ViewModel is IActivatableViewModel avm)
{
Activated.Subscribe(_ => avm.Activator.Activate()).DisposeWith(_compositeDisposable);
Deactivated.Subscribe(_ => avm.Activator.Deactivate());
}

_initSubject.OnNext(Unit.Default);

base.OnInitialized();
}

19 changes: 16 additions & 3 deletions src/ReactiveUI.Blazor/ReactiveLayoutComponentBase.cs
Original file line number Diff line number Diff line change
@@ -16,6 +16,9 @@ public class ReactiveLayoutComponentBase<T> : LayoutComponentBase, IViewFor<T>,
where T : class, INotifyPropertyChanged
{
private readonly Subject<Unit> _initSubject = new();
[SuppressMessage("Design", "CA2213: Dispose object", Justification = "Used for deactivation.")]
private readonly Subject<Unit> _deactivateSubject = new();
private readonly CompositeDisposable _compositeDisposable = [];

private T? _viewModel;

@@ -51,7 +54,7 @@ public T? ViewModel
public IObservable<Unit> Activated => _initSubject.AsObservable();

/// <inheritdoc />
public IObservable<Unit> Deactivated => Observable.Empty<Unit>();
public IObservable<Unit> Deactivated => _deactivateSubject.AsObservable();

/// <inheritdoc />
public void Dispose()
@@ -64,6 +67,12 @@ public void Dispose()
/// <inheritdoc />
protected override void OnInitialized()
{
if (ViewModel is IActivatableViewModel avm)
{
Activated.Subscribe(_ => avm.Activator.Activate()).DisposeWith(_compositeDisposable);
Deactivated.Subscribe(_ => avm.Activator.Deactivate());
}

_initSubject.OnNext(Unit.Default);
base.OnInitialized();
}
@@ -78,7 +87,8 @@ protected override void OnAfterRender(bool isFirstRender)
this.WhenAnyValue(x => x.ViewModel)
.Skip(1)
.WhereNotNull()
.Subscribe(_ => InvokeAsync(StateHasChanged));
.Subscribe(_ => InvokeAsync(StateHasChanged))
.DisposeWith(_compositeDisposable);
}

this.WhenAnyValue(x => x.ViewModel)
@@ -93,7 +103,8 @@ protected override void OnAfterRender(bool isFirstRender)
eh => x.PropertyChanged -= eh))
.Switch()
.Do(_ => InvokeAsync(StateHasChanged))
.Subscribe();
.Subscribe()
.DisposeWith(_compositeDisposable);
}

/// <summary>
@@ -113,6 +124,8 @@ protected virtual void Dispose(bool disposing)
if (disposing)
{
_initSubject.Dispose();
_compositeDisposable.Dispose();
_deactivateSubject.OnNext(Unit.Default);
}

_disposedValue = true;