Refactor Optimize null filtering (#3323)

Null was filtered twice.
reactiveui · Jul 24, 2022 · 03f4c95 · 03f4c95
1 parent c1b5ddc
commit 03f4c95
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/ReactiveUI.Blazor/ReactiveComponentBase.cs b/src/ReactiveUI.Blazor/ReactiveComponentBase.cs
@@ -88,7 +88,7 @@ protected override void OnAfterRender(bool firstRender)
             // 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 is not null)
+                    .WhereNotNull()
                     .Publish()
                     .RefCount(2);
 
@@ -97,7 +97,6 @@ protected override void OnAfterRender(bool firstRender)
                 .DisposeWith(_compositeDisposable);
 
             viewModelChanged
-                .WhereNotNull()
                 .Select(x =>
                             Observable
                                 .FromEvent<PropertyChangedEventHandler?, Unit>(

diff --git a/src/ReactiveUI.Blazor/ReactiveInjectableComponentBase.cs b/src/ReactiveUI.Blazor/ReactiveInjectableComponentBase.cs
@@ -88,7 +88,7 @@ protected override void OnAfterRender(bool firstRender)
             // 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 is not null)
+                    .WhereNotNull()
                     .Publish()
                     .RefCount(2);
 
@@ -97,7 +97,6 @@ protected override void OnAfterRender(bool firstRender)
                 .DisposeWith(_compositeDisposable);
 
             viewModelChanged
-                .WhereNotNull()
                 .Select(x =>
                             Observable
                                 .FromEvent<PropertyChangedEventHandler, Unit>(