Merge pull request #21 from nalu-development/nalu-v3

Nalu v3
nalu-development · Mar 18, 2024 · 481cbf2 · 481cbf2
2 parents dc4b1fe + 8d3df9f
commit 481cbf2
Show file tree

Hide file tree

Showing 88 changed files with 492 additions and 202 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -7,6 +7,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <MauiVersion>8.0.10</MauiVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="Package">

diff --git a/Nalu.sln b/Nalu.sln
@@ -79,6 +79,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nalu.Maui.Sample", "Samples
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nalu.Maui.DefaultShellSample", "Samples\Nalu.Maui.DefaultShellSample\Nalu.Maui.DefaultShellSample.csproj", "{D64BF572-B11E-4068-8848-70F3FF0FF2DF}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nalu.Maui.Navigation", "Source\Nalu.Maui.Navigation\Nalu.Maui.Navigation.csproj", "{CEB939B1-E5A5-462A-834F-7D32D1893444}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nalu.Maui.Core", "Source\Nalu.Maui.Core\Nalu.Maui.Core.csproj", "{BD63D735-B1BF-42CC-936E-A97991F29B1D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -99,6 +103,14 @@ Global
 		{D64BF572-B11E-4068-8848-70F3FF0FF2DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D64BF572-B11E-4068-8848-70F3FF0FF2DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D64BF572-B11E-4068-8848-70F3FF0FF2DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CEB939B1-E5A5-462A-834F-7D32D1893444}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CEB939B1-E5A5-462A-834F-7D32D1893444}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CEB939B1-E5A5-462A-834F-7D32D1893444}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CEB939B1-E5A5-462A-834F-7D32D1893444}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD63D735-B1BF-42CC-936E-A97991F29B1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD63D735-B1BF-42CC-936E-A97991F29B1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD63D735-B1BF-42CC-936E-A97991F29B1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BD63D735-B1BF-42CC-936E-A97991F29B1D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -112,6 +124,8 @@ Global
 		{5067A8EE-4496-4F5A-A5FB-4D66B89363E1} = {E1B24F25-B8A4-46EE-B7EB-7803DCFC543F}
 		{959B003B-842C-473F-99E5-E905642AFDAF} = {00000000-0000-0000-0000-000000000000}
 		{D64BF572-B11E-4068-8848-70F3FF0FF2DF} = {00000000-0000-0000-0000-000000000000}
+		{CEB939B1-E5A5-462A-834F-7D32D1893444} = {719809C2-A551-4C4A-9EFD-B10FB5E35BC0}
+		{BD63D735-B1BF-42CC-936E-A97991F29B1D} = {719809C2-A551-4C4A-9EFD-B10FB5E35BC0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {73F36209-F8D6-4066-8951-D97729F773CF}

diff --git a/README.md b/README.md
@@ -4,11 +4,24 @@
 
 <a style="float:right;text-decoration:none;margin-top:-66px;padding:8px 16px;color: #2C479D;border-radius:8px;box-shadow: 0 0 4px #2C479D;font-weight: 600;background: #f6fafe;" target="_blank" href="https://buymeacoffee.com/albyrock87">🍕&nbsp;<span class="bmc-btn-text">Buy me a pizza</span></a>
 
-## Nalu.Maui [![Nalu.Maui NuGet Package](https://img.shields.io/nuget/v/Nalu.Maui.svg)](https://www.nuget.org/packages/Nalu.Maui/) [![Nalu.Maui NuGet Package Downloads](https://img.shields.io/nuget/dt/Nalu.Maui)](https://www.nuget.org/packages/Nalu.Maui/)
+## Nalu.Maui
 
 Nalu.Maui is a library that solves some problems like navigation between pages in a MAUI application.
 
-### Navigation
+### Navigation [![Nalu.Maui.Navigation NuGet Package](https://img.shields.io/nuget/v/Nalu.Maui.Navigation.svg)](https://www.nuget.org/packages/Nalu.Maui/) [![Nalu.Maui NuGet Package Downloads](https://img.shields.io/nuget/dt/Nalu.Maui.Navigation)](https://www.nuget.org/packages/Nalu.Maui.Navigation/)
+
+#### Migration from v2.x to v3.x
+
+Migration from `Nalu.Maui` v2.x to v3.x is not automatic, you need to update your code to use the new `Nalu.Maui.Navigation` package.
+```
+xmlns:nalu="https://nalu-development.github.com/nalu"
+```
+becomes
+```
+xmlns:nalu="https://nalu-development.github.com/nalu/navigation"
+```
+
+#### Why Nalu navigation?
 
 Unfortunately MAUI navigation (NavigationPage, or Shell) do not provide automatic page/view model disposal as [widely explained in this issue](https://github.com/dotnet/maui/issues/7354).
 This is a problem because it can lead to memory/event leaks.
@@ -122,7 +135,7 @@ Use `nalu:Navigation.PageType` to specify the page type for each `ShellContent`.
 <nalu:NaluShell xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
                 xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                 xmlns:pages="clr-namespace:Nalu.Maui.Sample.PageModels"
-                xmlns:nalu="https://nalu-development.github.com/nalu"
+                xmlns:nalu="https://nalu-development.github.com/nalu/navigation"
                 x:Class="Nalu.Maui.Sample.AppShell">
     <FlyoutItem Route="main"
                 FlyoutDisplayOptions="AsMultipleItems">

diff --git a/Samples/Directory.Build.props b/Samples/Directory.Build.props
@@ -6,6 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <MauiVersion>8.0.10</MauiVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="Package">

diff --git a/Samples/Nalu.Maui.DefaultShellSample/App.xaml b/Samples/Nalu.Maui.DefaultShellSample/App.xaml
@@ -1,7 +1,6 @@
 <?xml version = "1.0" encoding = "UTF-8" ?>
 <Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace:Nalu.Maui.DefaultShellSample"
              x:Class="Nalu.Maui.DefaultShellSample.App">
     <Application.Resources>
         <ResourceDictionary>

diff --git a/Samples/Nalu.Maui.DefaultShellSample/Nalu.Maui.DefaultShellSample.csproj b/Samples/Nalu.Maui.DefaultShellSample/Nalu.Maui.DefaultShellSample.csproj
@@ -13,11 +13,10 @@
 
         <OutputType Condition="$(TargetFramework) != 'net8.0'">Exe</OutputType>
         <RootNamespace>Nalu.Maui.DefaultShellSample</RootNamespace>
-        <UseMaui>true</UseMaui>
         <SingleProject>true</SingleProject>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <MauiVersion>8.0.7</MauiVersion>
+        <UseMaui>true</UseMaui>
 
         <!-- Display name -->
         <ApplicationTitle>Nalu.Maui.DefaultShellSample</ApplicationTitle>

diff --git a/Samples/Nalu.Maui.DefaultShellSample/Pages/FivePage.xaml b/Samples/Nalu.Maui.DefaultShellSample/Pages/FivePage.xaml
@@ -3,10 +3,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:pageModels="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
-             xmlns:nalu="https://nalu-development.github.com/nalu"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
              x:Class="Nalu.Maui.DefaultShellSample.Pages.FivePage"
-             x:DataType="pageModels1:FivePageModel"
+             x:DataType="pageModels:FivePageModel"
              Title="Page Five"
              Padding="16">
     <ContentPage.Content>

diff --git a/Samples/Nalu.Maui.DefaultShellSample/Pages/FourPage.xaml b/Samples/Nalu.Maui.DefaultShellSample/Pages/FourPage.xaml
@@ -3,10 +3,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:pageModels="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
-             xmlns:nalu="https://nalu-development.github.com/nalu"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
              x:Class="Nalu.Maui.DefaultShellSample.Pages.FourPage"
-             x:DataType="pageModels1:FourPageModel"
+             x:DataType="pageModels:FourPageModel"
              Title="Page Four"
              Padding="16"
              Shell.PresentationMode="Modal">

diff --git a/Samples/Nalu.Maui.DefaultShellSample/Pages/OnePage.xaml b/Samples/Nalu.Maui.DefaultShellSample/Pages/OnePage.xaml
@@ -2,9 +2,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:pageModels="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
              x:Class="Nalu.Maui.DefaultShellSample.Pages.OnePage"
-             x:DataType="pageModels1:OnePageModel"
+             x:DataType="pageModels:OnePageModel"
              Title="Page One"
              Padding="16">
 

diff --git a/Samples/Nalu.Maui.DefaultShellSample/Pages/SevenPage.xaml b/Samples/Nalu.Maui.DefaultShellSample/Pages/SevenPage.xaml
@@ -3,10 +3,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:pageModels="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
-             xmlns:nalu="https://nalu-development.github.com/nalu"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
              x:Class="Nalu.Maui.DefaultShellSample.Pages.SevenPage"
-             x:DataType="pageModels1:SevenPageModel"
+             x:DataType="pageModels:SevenPageModel"
              Title="Page Seven"
              Padding="16">
     <ContentPage.Content>

diff --git a/Samples/Nalu.Maui.DefaultShellSample/Pages/SixPage.xaml b/Samples/Nalu.Maui.DefaultShellSample/Pages/SixPage.xaml
@@ -3,10 +3,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:pageModels="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
-             xmlns:nalu="https://nalu-development.github.com/nalu"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
              x:Class="Nalu.Maui.DefaultShellSample.Pages.SixPage"
-             x:DataType="pageModels1:SixPageModel"
+             x:DataType="pageModels:SixPageModel"
              Title="Page Six"
              Padding="16">
     <ContentPage.Content>

diff --git a/Samples/Nalu.Maui.DefaultShellSample/Pages/ThreePage.xaml b/Samples/Nalu.Maui.DefaultShellSample/Pages/ThreePage.xaml
@@ -3,9 +3,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:pageModels="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
              x:Class="Nalu.Maui.DefaultShellSample.Pages.ThreePage"
-             x:DataType="pageModels1:ThreePageModel"
+             x:DataType="pageModels:ThreePageModel"
              Title="Page Three"
              Padding="16">
     <ContentPage.Content>

diff --git a/Samples/Nalu.Maui.DefaultShellSample/Pages/TwoPage.xaml b/Samples/Nalu.Maui.DefaultShellSample/Pages/TwoPage.xaml
@@ -3,9 +3,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:pageModels="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
              x:Class="Nalu.Maui.DefaultShellSample.Pages.TwoPage"
-             x:DataType="pageModels1:TwoPageModel"
+             x:DataType="pageModels:TwoPageModel"
              Title="Page Two"
              Padding="16">
     <ContentPage.Content>

diff --git a/Samples/Nalu.Maui.Sample/AppShell.xaml b/Samples/Nalu.Maui.Sample/AppShell.xaml
@@ -2,7 +2,7 @@
 
 <nalu:NaluShell xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
                 xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-                xmlns:nalu="https://nalu-development.github.com/nalu"
+                xmlns:nalu="https://nalu-development.github.com/nalu/navigation"
                 xmlns:pages="clr-namespace:Nalu.Maui.Sample.Pages"
                 x:Class="Nalu.Maui.Sample.AppShell">
     <FlyoutItem Route="main"

diff --git a/Samples/Nalu.Maui.Sample/AppShell.xaml.cs b/Samples/Nalu.Maui.Sample/AppShell.xaml.cs
@@ -4,9 +4,8 @@ namespace Nalu.Maui.Sample;
 
 public partial class AppShell : NaluShell
 {
-    public AppShell(INavigationService navigationService) : base(navigationService, typeof(OnePage))
+    public AppShell(INavigationService navigationService) : base(navigationService, typeof(FivePage))
     {
         InitializeComponent();
     }
 }
-
diff --git a/Samples/Nalu.Maui.Sample/Nalu.Maui.Sample.csproj b/Samples/Nalu.Maui.Sample/Nalu.Maui.Sample.csproj
@@ -13,11 +13,10 @@
 
         <OutputType Condition="$(TargetFramework) != 'net8.0'">Exe</OutputType>
         <RootNamespace>Nalu.Maui.Sample</RootNamespace>
-        <UseMaui>true</UseMaui>
         <SingleProject>true</SingleProject>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <MauiVersion>8.0.7</MauiVersion>
+        <UseMaui>true</UseMaui>
 
         <!-- Display name -->
         <ApplicationTitle>Nalu.Maui.Sample</ApplicationTitle>

diff --git a/Samples/Nalu.Maui.Sample/PageModels/FivePageModel.cs b/Samples/Nalu.Maui.Sample/PageModels/FivePageModel.cs
@@ -1,10 +1,14 @@
 namespace Nalu.Maui.Sample.PageModels;
 
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 
-public class FivePageModel : ObservableObject
+public partial class FivePageModel(INavigationService navigationService) : ObservableObject
 {
     private static int _instanceCount;
 
     public int InstanceCount { get; } = Interlocked.Increment(ref _instanceCount);
+
+    [RelayCommand]
+    private Task GoToThreeAsync() => navigationService.GoToAsync(Navigation.Absolute().ShellContent<OnePageModel>().Add<ThreePageModel>());
 }
diff --git a/Samples/Nalu.Maui.Sample/PageModels/FourPageModel.cs b/Samples/Nalu.Maui.Sample/PageModels/FourPageModel.cs
@@ -17,7 +17,7 @@ public partial class FourPageModel(INavigationService navigationService) : Obser
     private Task NavigateToTwoAsync() => navigationService.GoToAsync(Navigation.Relative());
 
     [RelayCommand(AllowConcurrentExecutions = false)]
-    private Task NavigateToFiveAsync() => navigationService.GoToAsync(Navigation.Absolute().ShellContent<FivePageModel>());
+    private Task NavigateToFiveAsync() => navigationService.GoToAsync(Navigation.Absolute(NavigationBehavior.PopAllPagesOnItemChange | NavigationBehavior.IgnoreGuards).ShellContent<FivePageModel>());
 
     [RelayCommand(AllowConcurrentExecutions = false)]
     private Task NavigateToSevenAsync() => navigationService.GoToAsync(Navigation.Absolute().ShellContent<SevenPageModel>());

diff --git a/Samples/Nalu.Maui.Sample/PageModels/ThreePageModel.cs b/Samples/Nalu.Maui.Sample/PageModels/ThreePageModel.cs
@@ -14,6 +14,9 @@ public partial class ThreePageModel(INavigationService navigationService, IPopup
     [RelayCommand(AllowConcurrentExecutions = false)]
     private Task PushFourAsync() => navigationService.GoToAsync(Navigation.Relative().Push<FourPageModel>());
 
+    [RelayCommand(AllowConcurrentExecutions = false)]
+    private Task ReplaceSixAsync() => navigationService.GoToAsync(Navigation.Relative(NavigationBehavior.IgnoreGuards).Pop().Push<SixPageModel>());
+
     public async ValueTask<bool> CanLeaveAsync()
         // this will leak: https://github.com/CommunityToolkit/Maui/issues/1676
         => (bool)(await popupService.ShowPopupAsync<CanLeavePopupModel>() ?? false);

diff --git a/Samples/Nalu.Maui.Sample/Pages/FivePage.xaml b/Samples/Nalu.Maui.Sample/Pages/FivePage.xaml
@@ -3,10 +3,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:pageModels="clr-namespace:Nalu.Maui.Sample.PageModels"
-             xmlns:nalu="https://nalu-development.github.com/nalu"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.Sample.PageModels"
              x:Class="Nalu.Maui.Sample.Pages.FivePage"
-             x:DataType="pageModels1:FivePageModel"
+             x:DataType="pageModels:FivePageModel"
              Title="Page Five"
              Padding="16">
     <ContentPage.Content>
@@ -20,6 +18,7 @@
                     </FormattedString>
                 </Label.FormattedText>
             </Label>
+            <Button Text="Navigate to /One/Three" Command="{Binding GoToThreeCommand}" />
         </VerticalStackLayout>
     </ContentPage.Content>
 </ContentPage>
diff --git a/Samples/Nalu.Maui.Sample/Pages/FivePage.xaml.cs b/Samples/Nalu.Maui.Sample/Pages/FivePage.xaml.cs
@@ -1,6 +1,6 @@
 namespace Nalu.Maui.Sample.Pages;
 
-using Nalu.Maui.Sample.PageModels;
+using PageModels;
 
 public partial class FivePage : ContentPage
 {

diff --git a/Samples/Nalu.Maui.Sample/Pages/FourPage.xaml b/Samples/Nalu.Maui.Sample/Pages/FourPage.xaml
@@ -2,9 +2,9 @@
 
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.Sample.PageModels"
+             xmlns:pageModels="clr-namespace:Nalu.Maui.Sample.PageModels"
              x:Class="Nalu.Maui.Sample.Pages.FourPage"
-             x:DataType="pageModels1:FourPageModel"
+             x:DataType="pageModels:FourPageModel"
              Title="Page Four"
              Padding="16"
              Shell.PresentationMode="Modal">

diff --git a/Samples/Nalu.Maui.Sample/Pages/OnePage.xaml b/Samples/Nalu.Maui.Sample/Pages/OnePage.xaml
@@ -2,9 +2,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:pageModels="clr-namespace:Nalu.Maui.Sample.PageModels"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.Sample.PageModels"
              x:Class="Nalu.Maui.Sample.Pages.OnePage"
-             x:DataType="pageModels1:OnePageModel"
+             x:DataType="pageModels:OnePageModel"
              Title="Page One"
              Padding="16">
 

diff --git a/Samples/Nalu.Maui.Sample/Pages/SevenPage.xaml b/Samples/Nalu.Maui.Sample/Pages/SevenPage.xaml
@@ -3,10 +3,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:pageModels="clr-namespace:Nalu.Maui.Sample.PageModels"
-             xmlns:nalu="https://nalu-development.github.com/nalu"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.Sample.PageModels"
              x:Class="Nalu.Maui.Sample.Pages.SevenPage"
-             x:DataType="pageModels1:SevenPageModel"
+             x:DataType="pageModels:SevenPageModel"
              Title="Page Seven"
              Padding="16">
     <ContentPage.Content>

diff --git a/Samples/Nalu.Maui.Sample/Pages/SixPage.xaml b/Samples/Nalu.Maui.Sample/Pages/SixPage.xaml
@@ -3,10 +3,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:pageModels="clr-namespace:Nalu.Maui.Sample.PageModels"
-             xmlns:nalu="https://nalu-development.github.com/nalu"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.Sample.PageModels"
              x:Class="Nalu.Maui.Sample.Pages.SixPage"
-             x:DataType="pageModels1:SixPageModel"
+             x:DataType="pageModels:SixPageModel"
              Title="Page Six"
              Padding="16">
     <ContentPage.Content>

diff --git a/Samples/Nalu.Maui.Sample/Pages/ThreePage.xaml b/Samples/Nalu.Maui.Sample/Pages/ThreePage.xaml
@@ -3,9 +3,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:pageModels="clr-namespace:Nalu.Maui.Sample.PageModels"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.Sample.PageModels"
              x:Class="Nalu.Maui.Sample.Pages.ThreePage"
-             x:DataType="pageModels1:ThreePageModel"
+             x:DataType="pageModels:ThreePageModel"
              Title="Page Three"
              Padding="16">
     <ContentPage.Content>
@@ -20,6 +19,8 @@
             </Label>
             <Button Command="{Binding PushFourCommand}"
                     Text="Push Four"/>
+            <Button Command="{Binding ReplaceSixCommand}"
+                    Text="Replace with six"/>
         </VerticalStackLayout>
     </ContentPage.Content>
 </ContentPage>
diff --git a/Samples/Nalu.Maui.Sample/Pages/TwoPage.xaml b/Samples/Nalu.Maui.Sample/Pages/TwoPage.xaml
@@ -3,7 +3,7 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:pageModels="clr-namespace:Nalu.Maui.Sample.PageModels"
-             xmlns:nalu="https://nalu-development.github.com/nalu"
+             xmlns:nalu="https://nalu-development.github.com/nalu/navigation"
              xmlns:pages="clr-namespace:Nalu.Maui.Sample.Pages"
              x:Class="Nalu.Maui.Sample.Pages.TwoPage"
              x:DataType="pageModels:TwoPageModel"

diff --git a/...Internals/NaluElementHandlerExtensions.cs → ...Internals/NaluElementHandlerExtensions.cs b/...Internals/NaluElementHandlerExtensions.cs → ...Internals/NaluElementHandlerExtensions.cs