Merge pull request #317 from adospace/issue-312

adospace · web-flow · commit 88ffcd2ddb21 · 2025-04-09T16:43:10.000+02:00
Fixed Navigation stack is empty issue in tests
diff --git a/src/MauiReactor/Component.cs b/src/MauiReactor/Component.cs
@@ -151,7 +151,7 @@ protected virtual void OnMountedOrPropsChanged()
         }
 
         public INavigation? Navigation
-            => ContainerPage?.Navigation ?? NavigationProvider.Navigation;// ?? NavigationProvider.Navigation ?? throw new InvalidOperationException("Navigation is not available, , check its availability with the property IsNavigationAvailable");
+            => NavigationProvider.Navigation ?? ContainerPage?.Navigation;
 
         public Microsoft.Maui.Controls.Shell? CurrentShell
             => MauiControlsShellExtensions.CurrentShell;
diff --git a/src/MauiReactor/TemplateHost.cs b/src/MauiReactor/TemplateHost.cs
@@ -21,7 +21,6 @@ public class TemplateHost : VisualNode, ITemplateHost, IVisualNode, IHostElement
     private readonly LinkedList<IVisualNodeWithNativeControl> _listOfVisualsToAnimate = new();
     private bool _layoutCallEnqueued;
     private bool _started;
-    private Microsoft.Maui.Controls.Page? _containerPage;
 
     public TemplateHost(VisualNode root)
     {
@@ -46,11 +45,10 @@ public VisualNode Root
 
     internal static void FireLayoutCycleExecuted(object? sender)
         => LayoutCycleExecuted?.Invoke(sender, EventArgs.Empty);
-    public Microsoft.Maui.Controls.Page? ContainerPage => _containerPage ??= ((IVisualNode)_root).GetContainerPage();
 
     Microsoft.Maui.Controls.Page? IVisualNode.GetContainerPage()
     {
-        return ContainerPage;
+        return NativeElement as Microsoft.Maui.Controls.Page;
     }
 
     IHostElement? IVisualNode.GetPageHost()

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ protected virtual void OnMountedOrPropsChanged()`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`public INavigation? Navigation`
`154`		`- => ContainerPage?.Navigation ?? NavigationProvider.Navigation;// ?? NavigationProvider.Navigation ?? throw new InvalidOperationException("Navigation is not available, , check its availability with the property IsNavigationAvailable");`
	`154`	`+ => NavigationProvider.Navigation ?? ContainerPage?.Navigation;`
`155`	`155`
`156`	`156`	`public Microsoft.Maui.Controls.Shell? CurrentShell`
`157`	`157`	`=> MauiControlsShellExtensions.CurrentShell;`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ public class TemplateHost : VisualNode, ITemplateHost, IVisualNode, IHostElement`
`21`	`21`	`private readonly LinkedList<IVisualNodeWithNativeControl> _listOfVisualsToAnimate = new();`
`22`	`22`	`private bool _layoutCallEnqueued;`
`23`	`23`	`private bool _started;`
`24`		`- private Microsoft.Maui.Controls.Page? _containerPage;`
`25`	`24`
`26`	`25`	`public TemplateHost(VisualNode root)`
`27`	`26`	`{`
`@@ -46,11 +45,10 @@ public VisualNode Root`
`46`	`45`
`47`	`46`	`internal static void FireLayoutCycleExecuted(object? sender)`
`48`	`47`	`=> LayoutCycleExecuted?.Invoke(sender, EventArgs.Empty);`
`49`		`- public Microsoft.Maui.Controls.Page? ContainerPage => _containerPage ??= ((IVisualNode)_root).GetContainerPage();`
`50`	`48`
`51`	`49`	`Microsoft.Maui.Controls.Page? IVisualNode.GetContainerPage()`
`52`	`50`	`{`
`53`		`- return ContainerPage;`
	`51`	`+ return NativeElement as Microsoft.Maui.Controls.Page;`
`54`	`52`	`}`
`55`	`53`
`56`	`54`	`IHostElement? IVisualNode.GetPageHost()`