Simplify NavigationHandler

Dreamescaper · Sep 6, 2023 · 7af8b66 · 7af8b66
1 parent ffd7b97
commit 7af8b66
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/BlazorBindings.Maui/Navigation/NavigationHandler.cs b/src/BlazorBindings.Maui/Navigation/NavigationHandler.cs
@@ -23,10 +23,6 @@ public NavigationHandler(MC.INavigation navigation, NavigationTarget target, boo
 
     public async Task AddChildAsync(MC.Page child)
     {
-        // The order of AddChild and RemoveChild is undetermined. We need to make sure that the previous page is removed.
-        if (_currentPage != null)
-            await RemoveChildAsync(_currentPage);
-
         _currentPage = child;
 
         if (_target == NavigationTarget.Modal)
@@ -67,6 +63,7 @@ private void ParentChanged(object sender, EventArgs e)
 
         if (page == _currentPage && page.Parent == null)
         {
+            // Notify that the page is closed so that rootComponent could be removed from Blazor tree.
             PageClosed?.Invoke();
         }
 

diff --git a/src/BlazorBindings.UnitTests/Elements/RefreshViewTests.razor b/src/BlazorBindings.UnitTests/Elements/RefreshViewTests.razor
@@ -21,7 +21,7 @@
 
         refreshView.IsRefreshing = true;
 
-        await Task.Delay(5);
+        await Task.Delay(10);
         Assert.That(refreshInvokeStarted, Is.True);
         Assert.That(refreshView.IsRefreshing, Is.True);