From c6a74977a0f9d3b9d31cd6f40a6b98122adbd5d1 Mon Sep 17 00:00:00 2001
From: Oleksandr Liakhevych <liakh.oleksandr32@gmail.com>
Date: Mon, 27 Mar 2023 02:09:47 +0300
Subject: [PATCH 1/2] Do not use Shell for URI navigation

---
 ...{Navigation.Shell.cs => Navigation.Uri.cs} | 29 +++--------
 .../Navigation/Shell/MBBRouteFactory.cs       | 49 -------------------
 .../Components/SwitchablePages.razor          |  8 +--
 3 files changed, 11 insertions(+), 75 deletions(-)
 rename src/BlazorBindings.Maui/Navigation/{Navigation.Shell.cs => Navigation.Uri.cs} (71%)
 delete mode 100644 src/BlazorBindings.Maui/Navigation/Shell/MBBRouteFactory.cs

diff --git a/src/BlazorBindings.Maui/Navigation/Navigation.Shell.cs b/src/BlazorBindings.Maui/Navigation/Navigation.Uri.cs
similarity index 71%
rename from src/BlazorBindings.Maui/Navigation/Navigation.Shell.cs
rename to src/BlazorBindings.Maui/Navigation/Navigation.Uri.cs
index 4e70c613..9995f82b 100644
--- a/src/BlazorBindings.Maui/Navigation/Navigation.Shell.cs
+++ b/src/BlazorBindings.Maui/Navigation/Navigation.Uri.cs
@@ -7,12 +7,10 @@ namespace BlazorBindings.Maui;
 
 public partial class Navigation
 {
-    private readonly Dictionary<string, MBBRouteFactory> RouteFactories = new();
-    private readonly Dictionary<Type, StructuredRouteResult> NavigationParameters = new();
     private List<StructuredRoute> Routes;
 
     /// <summary>
-    /// Performs URI-based Shell navigation. This method is only available for Shell-based applications.
+    /// Performs URI-based navigation.
     /// </summary>
     /// <param name="uri">URI to navigate to.</param>
     /// <param name="parameters">Additional parameters to set for component.</param>
@@ -20,22 +18,14 @@ public async Task NavigateToAsync(string uri, Dictionary<string, object> paramet
     {
         ArgumentNullException.ThrowIfNull(uri);
 
-        var shell = MC.Shell.Current
-            ?? throw new InvalidOperationException("URI-based navigation requires Shell-based application.");
-
         Routes ??= FindRoutes();
 
         var route = StructuredRoute.FindBestMatch(uri, Routes, parameters);
 
         if (route != null)
         {
-            NavigationParameters[route.Route.Type] = route;
-            if (!RouteFactories.TryGetValue(route.Route.BaseUri, out var routeFactory))
-            {
-                throw new InvalidOperationException($"A route factory for URI '{uri}' could not be found.");
-            }
-            await routeFactory.CreateAsync();
-            await shell.GoToAsync(route.Route.BaseUri);
+            var pars = GetParameters(route);
+            await Navigate(route.Route.Type, pars, NavigationTarget.Navigation, true);
         }
         else
         {
@@ -67,13 +57,8 @@ private List<StructuredRoute> FindRoutes()
 
                 var structuredRoute = new StructuredRoute(route.Template, page);
 
-                //Register with XamarinForms so it can handle Navigation.
-                var routeFactory = new MBBRouteFactory(page, BuildPage);
-                MC.Routing.RegisterRoute(structuredRoute.BaseUri, routeFactory);
-
                 //Also register route in our own list for setting parameters and tracking if it is registered;
                 result.Add(structuredRoute);
-                RouteFactories[structuredRoute.BaseUri] = routeFactory;
             }
         }
 
@@ -103,11 +88,9 @@ private static Dictionary<string, object> ConvertParameters(Type componentType,
         return convertedParameters;
     }
 
-    private Task<MC.Page> BuildPage(Type componentType)
+    private Dictionary<string, object> GetParameters(StructuredRouteResult route)
     {
-        var route = NavigationParameters[componentType];
-
-        var parameters = ConvertParameters(componentType, route.PathParameters);
+        var parameters = ConvertParameters(route.Route.Type, route.PathParameters);
 
         if (route.AdditionalParameters is not null)
         {
@@ -124,6 +107,6 @@ private static Dictionary<string, object> ConvertParameters(Type componentType,
             }
         }
 
-        return BuildElement<MC.Page>(componentType, parameters);
+        return parameters;
     }
 }
diff --git a/src/BlazorBindings.Maui/Navigation/Shell/MBBRouteFactory.cs b/src/BlazorBindings.Maui/Navigation/Shell/MBBRouteFactory.cs
deleted file mode 100644
index cca45e60..00000000
--- a/src/BlazorBindings.Maui/Navigation/Shell/MBBRouteFactory.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-using Microsoft.Maui.Controls;
-using MC = Microsoft.Maui.Controls;
-
-namespace BlazorBindings.Maui.ShellNavigation;
-
-//Based on the forms TypeRouteFactory https://github.com/xamarin/Xamarin.Forms/blob/9fd882e6c598a51bffbbb2f4de72c3bd9023ab41/Xamarin.Forms.Core/Routing.cs
-internal class MBBRouteFactory : MC.RouteFactory
-{
-    private readonly Type _componentType;
-    private readonly Func<Type, Task<Page>> _pageFactory;
-    private MC.Page _element;
-
-    public MBBRouteFactory(Type componentType, Func<Type, Task<MC.Page>> pageFactory)
-    {
-        _componentType = componentType ?? throw new ArgumentNullException(nameof(componentType));
-        _pageFactory = pageFactory ?? throw new ArgumentNullException(nameof(pageFactory));
-    }
-
-    public override MC.Element GetOrCreate()
-    {
-        return _element
-            ?? throw new InvalidOperationException("The target element of the Shell navigation is supposed to be created at this point.");
-    }
-
-    public override MC.Element GetOrCreate(IServiceProvider services) => GetOrCreate();
-
-    public async Task CreateAsync()
-    {
-        _element = await _pageFactory(_componentType);
-    }
-
-    public override bool Equals(object obj)
-    {
-        if ((obj is MBBRouteFactory otherRouteFactory))
-        {
-            return otherRouteFactory._componentType == _componentType;
-        }
-
-        return false;
-    }
-
-    public override int GetHashCode()
-    {
-        return _componentType.GetHashCode();
-    }
-}
diff --git a/src/BlazorBindings.UnitTests/Components/SwitchablePages.razor b/src/BlazorBindings.UnitTests/Components/SwitchablePages.razor
index 4ce75608..1f5ee375 100644
--- a/src/BlazorBindings.UnitTests/Components/SwitchablePages.razor
+++ b/src/BlazorBindings.UnitTests/Components/SwitchablePages.razor
@@ -1,4 +1,6 @@
-@if (_switch)
+@page "/switchable-pages"
+
+@if (_switch)
 {
     <ContentPage Title="Page1">
         <Button OnClick="Switch" />
@@ -12,6 +14,6 @@ else
 }
 
 @code {
-bool _switch = true;
-void Switch() => _switch = !_switch;
+    bool _switch = true;
+    void Switch() => _switch = !_switch;
 }

From ededbdbfd1f7d424d175a2e779d766914f451fb4 Mon Sep 17 00:00:00 2001
From: Oleksandr Liakhevych <liakh.oleksandr32@gmail.com>
Date: Mon, 27 Mar 2023 02:17:57 +0300
Subject: [PATCH 2/2] Add tests

---
 .../PageContentWithCascadingParameter.razor   |  4 ++-
 .../Navigation/ShellNavigationTests.cs        | 35 +++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/BlazorBindings.UnitTests/Components/PageContentWithCascadingParameter.razor b/src/BlazorBindings.UnitTests/Components/PageContentWithCascadingParameter.razor
index 5e8792be..9ba89257 100644
--- a/src/BlazorBindings.UnitTests/Components/PageContentWithCascadingParameter.razor
+++ b/src/BlazorBindings.UnitTests/Components/PageContentWithCascadingParameter.razor
@@ -1,4 +1,6 @@
-<ContentPage Title="Test">
+@page "/page-with-cascading-param"
+
+<ContentPage Title="Test">
     <VerticalStackLayout>
         <Label>@Par1</Label>
         <NonPageContent />
diff --git a/src/BlazorBindings.UnitTests/Navigation/ShellNavigationTests.cs b/src/BlazorBindings.UnitTests/Navigation/ShellNavigationTests.cs
index 874fae6c..47c87745 100644
--- a/src/BlazorBindings.UnitTests/Navigation/ShellNavigationTests.cs
+++ b/src/BlazorBindings.UnitTests/Navigation/ShellNavigationTests.cs
@@ -52,4 +52,39 @@ public async Task ComponentShouldBeDisposedOnPopAsync()
 
         Assert.That(isDisposed);
     }
+
+    [Test]
+    public async Task NavigatedComponentShouldBeAbleToReplacePage()
+    {
+        await _navigationService.NavigateToAsync("/switchable-pages");
+        var navigatedPage = _mauiNavigation.NavigationStack.Last();
+
+        Assert.That(_mauiNavigation.NavigationStack.Count, Is.EqualTo(2));
+        Assert.That(navigatedPage.Title, Is.EqualTo("Page1"));
+
+        var switchButton = (MC.Button)((MC.ContentPage)navigatedPage).Content;
+        switchButton.SendClicked();
+        navigatedPage = _mauiNavigation.NavigationStack.Last();
+
+        Assert.That(_mauiNavigation.NavigationStack.Count, Is.EqualTo(2));
+        Assert.That(navigatedPage.Title, Is.EqualTo("Page2"));
+
+        switchButton = (MC.Button)((MC.ContentPage)navigatedPage).Content;
+        switchButton.SendClicked();
+        navigatedPage = _mauiNavigation.NavigationStack.Last();
+
+        Assert.That(_mauiNavigation.NavigationStack.Count, Is.EqualTo(2));
+        Assert.That(navigatedPage.Title, Is.EqualTo("Page1"));
+    }
+
+    [Test]
+    public async Task PushPageWithRootWrapper()
+    {
+        _navigationService.SetWrapperComponentType(typeof(WrapperWithCascadingValue));
+
+        await _navigationService.NavigateToAsync("/page-with-cascading-param");
+        var navigatedPage = _mauiNavigation.NavigationStack.Last();
+
+        PageContentWithCascadingParameter.ValidateContent(navigatedPage, WrapperWithCascadingValue.Value);
+    }
 }