Skip to content

Refactor ViewModel change subscriptions in Blazor components #4069

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.

Sign up for GitHub

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 1 commit into from
Jul 4, 2025
+42 −36
Merged

Refactor ViewModel change subscriptions in Blazor components #4069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions src/ReactiveUI.Blazor/ReactiveComponentBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,15 @@ protected override void OnAfterRender(bool firstRender)

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))
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))
.DisposeWith(_compositeDisposable);
Expand Down
18 changes: 9 additions & 9 deletions src/ReactiveUI.Blazor/ReactiveInjectableComponentBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,15 @@ protected override void OnAfterRender(bool firstRender)

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))
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))
.DisposeWith(_compositeDisposable);
Expand Down
42 changes: 24 additions & 18 deletions src/ReactiveUI.Blazor/ReactiveLayoutComponentBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,34 +84,40 @@ protected override void OnAfterRender(bool isFirstRender)
{
if (isFirstRender)
{
this.WhenAnyValue(x => x.ViewModel)
.Skip(1)
.WhereNotNull()
var viewModelChanged =
this.WhenAnyValue(x => x.ViewModel)
.WhereNotNull()
.Publish()
.RefCount(2);

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

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))
.DisposeWith(_compositeDisposable);
}

this.WhenAnyValue(x => x.ViewModel)
.WhereNotNull()
.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()
.DisposeWith(_compositeDisposable);
base.OnAfterRender(isFirstRender);
}

/// <summary>
/// Invokes the property changed event.
/// </summary>
/// <param name="propertyName">The name of the property.</param>
protected virtual void OnPropertyChanged([CallerMemberName]string? propertyName = null) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));

/// <summary>
/// Cleans up the managed resources of the object.
Expand Down