Merge pull request #3180 from PrismLibrary/dev/ds/null-reference-fix

fix: null reference on TabbedPage evaluation
PrismLibrary · Jul 4, 2024 · e64870b · e64870b
2 parents 7be5a56 + b4ba49a
commit e64870b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/src/Maui/Prism.Maui/Navigation/PageNavigationService.cs b/src/Maui/Prism.Maui/Navigation/PageNavigationService.cs
@@ -846,7 +846,7 @@ private static void OnNavigatedTo(Page toPage, INavigationParameters parameters)
             {
                 MvvmHelpers.OnNavigatedTo(navigationPage.CurrentPage, parameters);
             }
-            else if (tabbedPage.BindingContext != tabbedPage.CurrentPage.BindingContext)
+            else if (tabbedPage.BindingContext != tabbedPage.CurrentPage?.BindingContext)
             {
                 MvvmHelpers.OnNavigatedTo(tabbedPage.CurrentPage, parameters);
             }

diff --git a/tests/Maui/Prism.DryIoc.Maui.Tests/Fixtures/Navigation/NavigationTests.cs b/tests/Maui/Prism.DryIoc.Maui.Tests/Fixtures/Navigation/NavigationTests.cs
@@ -22,6 +22,7 @@ public NavigationTests(ITestOutputHelper testOutputHelper)
     [InlineData("MockHome/NavigationPage/MockViewA")]
     [InlineData("MockExplicitTabbedPage")]
     [InlineData("TabbedPage?createTab=NavigationPage%2FMockViewA%2FMockViewB%3Fid%3D5%2FMockViewC&createTab=MockViewD")]
+    [InlineData("NavigationPage/MockViewB/TabbedPage?createTab=MockViewA/MockViewC")]
     public void PagesInjectScopedInstanceOfIPageAccessor(string uri)
     {
         var mauiApp = CreateBuilder(prism => prism.CreateWindow(uri))

diff --git a/tests/Maui/Prism.Maui.Tests/Prism.Maui.Tests.csproj b/tests/Maui/Prism.Maui.Tests/Prism.Maui.Tests.csproj
@@ -33,8 +33,4 @@
     <ProjectReference Include="..\..\..\src\Maui\Prism.Maui\Prism.Maui.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Fixtures\Mvvm\" />
-  </ItemGroup>
-
 </Project>