From 9bfcdf809902fc2520af0089a99cf9683347c1c8 Mon Sep 17 00:00:00 2001
From: Easley <nevermore.wd@me.com>
Date: Fri, 30 May 2025 17:58:28 +0800
Subject: [PATCH 1/5] add view alias

---
 .../ViewModels/MainViewModel.cs                        |  3 ++-
 .../Lemon.ModuleNavigation.Sample/Views/MainView.axaml |  2 +-
 .../MainWindowViewModel.cs                             |  3 ++-
 .../Lemon.ModuleNavigation.WpfSample/MainWindow.xaml   |  2 +-
 .../Abstractions/IRegionManager.cs                     |  5 +----
 .../Abstractions/IViewNavigationHandler.cs             |  6 ++++--
 .../Abstractions/IViewNavigationService.cs             |  6 ++++--
 src/Lemon.ModuleNavigation/NavigationContext.cs        |  9 ++++++++-
 src/Lemon.ModuleNavigation/NavigationHandler.cs        | 10 ++++++----
 src/Lemon.ModuleNavigation/NavigationService.cs        | 10 ++++++----
 src/Lemon.ModuleNavigation/RegionManager.cs            |  4 ++--
 11 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/samples/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs b/samples/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
index b8427ca..00c01ef 100644
--- a/samples/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
+++ b/samples/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
@@ -47,7 +47,8 @@ public MainViewModel(IEnumerable<IModule> modules,
                 new NavigationParameters { { "requestNew", requestNew } });
             _navigationService.RequestViewNavigation("TabRegion", 
                 viewName, 
-                new NavigationParameters { { "requestNew", requestNew } });
+                new NavigationParameters { { "requestNew", requestNew } },
+                $"alias-{viewName}");
             _navigationService.RequestViewNavigation("ItemsRegion", 
                 viewName, 
                 new NavigationParameters { { "requestNew", requestNew } });
diff --git a/samples/Lemon.ModuleNavigation.Sample/Views/MainView.axaml b/samples/Lemon.ModuleNavigation.Sample/Views/MainView.axaml
index 03b760a..370eac4 100644
--- a/samples/Lemon.ModuleNavigation.Sample/Views/MainView.axaml
+++ b/samples/Lemon.ModuleNavigation.Sample/Views/MainView.axaml
@@ -72,7 +72,7 @@
                         <TabControl.ItemTemplate>
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal" Spacing="2">
-                                    <TextBlock Text="{Binding}" />
+                                    <TextBlock Text="{Binding Alias}" />
                                     <Button
                                         Content="X"
                                         FontSize="11"
diff --git a/samples/Lemon.ModuleNavigation.SampleViewModel/MainWindowViewModel.cs b/samples/Lemon.ModuleNavigation.SampleViewModel/MainWindowViewModel.cs
index 2427c6f..a443695 100644
--- a/samples/Lemon.ModuleNavigation.SampleViewModel/MainWindowViewModel.cs
+++ b/samples/Lemon.ModuleNavigation.SampleViewModel/MainWindowViewModel.cs
@@ -3,6 +3,7 @@
 using ReactiveUI;
 using System.Diagnostics;
 using System.Reactive;
+using System.Reflection;
 
 namespace Lemon.ModuleNavigation.SampleViewModel;
 
@@ -32,7 +33,7 @@ public MainWindowViewModel(INavigationService navigationService,
 
             }
             _navigationService.RequestViewNavigation("ContentRegion", viewName, new NavigationParameters { { "requestNew", requestNew } });
-            _navigationService.RequestViewNavigation("TabRegion", viewName, new NavigationParameters { { "requestNew", requestNew } });
+            _navigationService.RequestViewNavigation("TabRegion", viewName, new NavigationParameters { { "requestNew", requestNew } }, $"alias-{viewName}");
             _navigationService.RequestViewNavigation("ItemsRegion", viewName, new NavigationParameters { { "requestNew", requestNew } });
         });
 
diff --git a/samples/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml b/samples/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml
index 5382efe..c9fc794 100644
--- a/samples/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml
+++ b/samples/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml
@@ -55,7 +55,7 @@
                             <TabControl.ItemTemplate>
                                 <DataTemplate>
                                     <StackPanel Orientation="Horizontal">
-                                        <TextBlock Text="{Binding}" />
+                                        <TextBlock Text="{Binding Alias}" />
                                         <Button
                                             Width="20"
                                             Height="20"
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs b/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs
index bc855da..63c5942 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs
@@ -6,14 +6,11 @@ public interface IRegionManager : IObservable<NavigationContext>, IObservable<IR
 {
     void AddRegion(string regionName, IRegion region);
     IRegion? GetRegion(string regionName);
-
-    void RequestViewNavigate(string regionName, string viewName, NavigationParameters? parameters = null);
+    void RequestViewNavigate(string regionName, string viewName, NavigationParameters? parameters = null, string? alias = null);
     [Obsolete("requestNew was obsolete.Consider IsNavigationTarget() in INavigationAware instead.")]
     void RequestNavigate(string regionName, string viewName, bool requestNew, NavigationParameters? parameters = null);
     void RequestViewUnload(string regionName, string viewName);
     void RequestViewUnload(NavigationContext context);
-
-
     void RequestModuleNavigate(string regionName, string moduleName, NavigationParameters? parameters);
     void RequestModuleNavigate(string regionName, IModule module, NavigationParameters? parameters);
     void RequestModuleUnload(string moduleName, string viewName);
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationHandler.cs b/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationHandler.cs
index d74c595..31c2209 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationHandler.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationHandler.cs
@@ -5,10 +5,12 @@ namespace Lemon.ModuleNavigation.Abstractions;
 public interface IViewNavigationHandler
 {
     void OnNavigateTo(string regionName, 
-        string viewName);
+        string viewName,
+        string? alias = null);
     void OnNavigateTo(string regionName, 
         string viewName,
-        NavigationParameters parameters);
+        NavigationParameters parameters,
+        string? alias = null);
     void OnViewUnload(string regionName,
         string viewName);
 }
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationService.cs b/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationService.cs
index c05cafd..4554ae0 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationService.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationService.cs
@@ -20,7 +20,8 @@ void RequestViewNavigation(string regionName,
         bool requestNew);
 
     void RequestViewNavigation(string regionName,
-        string viewName);
+        string viewName, 
+        string? alias = null);
 
     /// <summary>
     /// RequestViewNavigation
@@ -40,7 +41,8 @@ void RequestViewNavigation(string regionName,
 
     void RequestViewNavigation(string regionName,
         string viewName,
-        NavigationParameters parameters);
+        NavigationParameters parameters,
+        string? alias = null);
 
     /// <summary>
     /// RequestViewUnload
diff --git a/src/Lemon.ModuleNavigation/NavigationContext.cs b/src/Lemon.ModuleNavigation/NavigationContext.cs
index 8f1eced..6e526b4 100644
--- a/src/Lemon.ModuleNavigation/NavigationContext.cs
+++ b/src/Lemon.ModuleNavigation/NavigationContext.cs
@@ -21,12 +21,14 @@ internal NavigationContext(string viewName,
     internal NavigationContext(string viewName,
         string regionName,
         IServiceProvider serviceProvider,
-        NavigationParameters? navigationParameters)
+        NavigationParameters? navigationParameters,
+        string? alias)
     {
         ViewName = viewName;
         Parameters = navigationParameters;
         RegionName = regionName;
         ServiceProvider = serviceProvider;
+        Alias = alias;
     }
     public static ViewNameComparer ViewNameComparer => new();
     public static StrictComparer StrictComparer => new();
@@ -35,6 +37,11 @@ public string ViewName
         get; 
         private set; 
     }
+    public string? Alias
+    {
+        get;
+        private set;
+    }
     public NavigationParameters? Parameters 
     { 
         get; 
diff --git a/src/Lemon.ModuleNavigation/NavigationHandler.cs b/src/Lemon.ModuleNavigation/NavigationHandler.cs
index da2d2bb..6d19f44 100644
--- a/src/Lemon.ModuleNavigation/NavigationHandler.cs
+++ b/src/Lemon.ModuleNavigation/NavigationHandler.cs
@@ -33,15 +33,17 @@ public void OnNavigateTo(string moduleKey, NavigationParameters? parameters)
         _moduleManager.RequestNavigate(moduleKey, parameters);
     }
     public void OnNavigateTo(string regionName,
-         string viewName)
+         string viewName,
+         string? alias = null)
     {
-        RegionManager.RequestViewNavigate(regionName, viewName, null);
+        RegionManager.RequestViewNavigate(regionName, viewName, null, alias);
     }
     public void OnNavigateTo(string regionName,
         string viewName,
-        NavigationParameters navigationParameters)
+        NavigationParameters navigationParameters,
+        string? alias = null)
     {
-        RegionManager.RequestViewNavigate(regionName, viewName, navigationParameters);
+        RegionManager.RequestViewNavigate(regionName, viewName, navigationParameters, alias);
     }
 
     public void OnViewUnload(string regionName, string viewName)
diff --git a/src/Lemon.ModuleNavigation/NavigationService.cs b/src/Lemon.ModuleNavigation/NavigationService.cs
index 502402f..697ad4c 100644
--- a/src/Lemon.ModuleNavigation/NavigationService.cs
+++ b/src/Lemon.ModuleNavigation/NavigationService.cs
@@ -40,21 +40,23 @@ public void RequestModuleNavigate(string moduleName, NavigationParameters? param
         _bufferModuleName.Push((moduleName, parameters));
     }
     public void RequestViewNavigation(string regionName,
-       string viewName)
+       string viewName,
+       string? alias = null)
     {
         foreach (var handler in _viewHandlers)
         {
-            handler.OnNavigateTo(regionName, viewName);
+            handler.OnNavigateTo(regionName, viewName, alias);
         }
         _bufferViewName.Push((regionName, viewName, null));
     }
     public void RequestViewNavigation(string regionName,
         string viewName,
-        NavigationParameters parameters)
+        NavigationParameters parameters,
+        string? alias = null)
     {
         foreach (var handler in _viewHandlers)
         {
-            handler.OnNavigateTo(regionName, viewName, parameters);
+            handler.OnNavigateTo(regionName, viewName, parameters, alias);
         }
         _bufferViewName.Push((regionName, viewName, parameters));
     }
diff --git a/src/Lemon.ModuleNavigation/RegionManager.cs b/src/Lemon.ModuleNavigation/RegionManager.cs
index a26575d..30fd7c3 100644
--- a/src/Lemon.ModuleNavigation/RegionManager.cs
+++ b/src/Lemon.ModuleNavigation/RegionManager.cs
@@ -41,9 +41,9 @@ public void RequestNavigate(string regionName, string viewName, bool requestNew,
                 });
         }
     }
-    public void RequestViewNavigate(string regionName, string viewName, NavigationParameters? parameters = null)
+    public void RequestViewNavigate(string regionName, string viewName, NavigationParameters? parameters = null, string? alias = null)
     {
-        var context = new NavigationContext(viewName, regionName, _serviceProvider, parameters);
+        var context = new NavigationContext(viewName, regionName, _serviceProvider, parameters, alias);
         if (_regions.TryGetValue(regionName, out var region))
         {
             region.Activate(context);

From f504c155fd46ea199c50aeb658c0c9c230669b1c Mon Sep 17 00:00:00 2001
From: Easley <nevermore.wd@me.com>
Date: Tue, 3 Jun 2025 11:39:51 +0800
Subject: [PATCH 2/5] add ICanUnload

---
 .../BaseNavigationViewModel.cs                 |  2 +-
 .../Regions/Region.cs                          | 18 ++++++++++++------
 .../Regions/Region.cs                          |  9 ++++++---
 .../Abstractions/ICanUnload.cs                 |  6 ++++++
 .../Abstractions/INavigationAware.cs           |  1 -
 5 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 src/Lemon.ModuleNavigation/Abstractions/ICanUnload.cs

diff --git a/samples/Lemon.ModuleNavigation.SampleViewModel/BaseNavigationViewModel.cs b/samples/Lemon.ModuleNavigation.SampleViewModel/BaseNavigationViewModel.cs
index 670d887..6ea7573 100644
--- a/samples/Lemon.ModuleNavigation.SampleViewModel/BaseNavigationViewModel.cs
+++ b/samples/Lemon.ModuleNavigation.SampleViewModel/BaseNavigationViewModel.cs
@@ -5,7 +5,7 @@
 
 namespace Lemon.ModuleNavigation.SampleViewModel;
 
-public class BaseNavigationViewModel : ReactiveObject, INavigationAware
+public class BaseNavigationViewModel : ReactiveObject, INavigationAware, ICanUnload
 {
     public virtual string Greeting => $"Welcome to {GetType().Name}[{Environment.ProcessId}][{Environment.CurrentManagedThreadId}]{Environment.NewLine}{DateTime.Now:yyyy-MM-dd HH-mm-ss.ffff}";
 
diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/Regions/Region.cs b/src/Lemon.ModuleNavigation.Avaloniaui/Regions/Region.cs
index 58377d5..2899252 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/Regions/Region.cs
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/Regions/Region.cs
@@ -80,10 +80,13 @@ public virtual void ScrollIntoView(NavigationContext item)
 
             view.DataContext = navigationAware;
             navigationAware.OnNavigatedTo(context);
-            navigationAware.RequestUnload += () =>
+            if (navigationAware is ICanUnload canUnloadNavigationAware)
             {
-                DeActivate(context);
-            };
+                canUnloadNavigationAware.RequestUnload += () =>
+                {
+                    DeActivate(context);
+                };
+            }
             Current.SetData((view, navigationAware));
             context.View = view;
             ViewCache.AddOrUpdate(context, view, (key, value) => view);
@@ -137,10 +140,13 @@ private IDataTemplate CreateRegionDataTemplate()
 
                 view.DataContext = navigationAware;
                 navigationAware.OnNavigatedTo(context);
-                navigationAware.RequestUnload += () =>
+                if (navigationAware is ICanUnload canUnloadNavigationAware)
                 {
-                    DeActivate(context);
-                };
+                    canUnloadNavigationAware.RequestUnload += () =>
+                    {
+                        DeActivate(context);
+                    };
+                }
                 Current.SetData((view, navigationAware));
                 context.View = view;
                 ViewCache.AddOrUpdate(context, view, (key, value) => view);
diff --git a/src/Lemon.ModuleNavigation.Wpf/Regions/Region.cs b/src/Lemon.ModuleNavigation.Wpf/Regions/Region.cs
index 5948264..ed19e79 100644
--- a/src/Lemon.ModuleNavigation.Wpf/Regions/Region.cs
+++ b/src/Lemon.ModuleNavigation.Wpf/Regions/Region.cs
@@ -80,10 +80,13 @@ public virtual void ScrollIntoView(NavigationContext item)
 
             view.DataContext = navigationAware;
             navigationAware.OnNavigatedTo(context);
-            navigationAware.RequestUnload += () =>
+            if (navigationAware is ICanUnload canUnloadNavigationAware)
             {
-                DeActivate(context);
-            };
+                canUnloadNavigationAware.RequestUnload += () =>
+                {
+                    DeActivate(context);
+                };
+            }
             Current.SetData((view, navigationAware));
             context.View = view;
             ViewCache.AddOrUpdate(context, view, (key, value) => view);
diff --git a/src/Lemon.ModuleNavigation/Abstractions/ICanUnload.cs b/src/Lemon.ModuleNavigation/Abstractions/ICanUnload.cs
new file mode 100644
index 0000000..a808751
--- /dev/null
+++ b/src/Lemon.ModuleNavigation/Abstractions/ICanUnload.cs
@@ -0,0 +1,6 @@
+namespace Lemon.ModuleNavigation.Abstractions;
+
+public interface ICanUnload
+{
+    event Action? RequestUnload;
+}
diff --git a/src/Lemon.ModuleNavigation/Abstractions/INavigationAware.cs b/src/Lemon.ModuleNavigation/Abstractions/INavigationAware.cs
index 23d0913..f77ed78 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/INavigationAware.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/INavigationAware.cs
@@ -2,7 +2,6 @@
 
 public interface INavigationAware
 {
-    event Action? RequestUnload;
     void OnNavigatedTo(NavigationContext navigationContext);
     bool IsNavigationTarget(NavigationContext navigationContext);
     void OnNavigatedFrom(NavigationContext navigationContext);

From 124b32bca298b486c2056812b5c199d310045a52 Mon Sep 17 00:00:00 2001
From: Easley <nevermore.wd@me.com>
Date: Wed, 25 Jun 2025 16:16:09 +0800
Subject: [PATCH 3/5] Move Alias to INavigationAware

---
 .../ViewModels/MainViewModel.cs               |  3 +-
 .../BaseNavigationViewModel.cs                |  2 +-
 .../MainWindowViewModel.cs                    |  2 +-
 .../ViewAlphaViewModel.cs                     |  1 +
 .../ViewBetaViewModel.cs                      |  2 +-
 .../Regions/Region.cs                         |  1 +
 .../Regions/Region.cs                         |  1 +
 .../Abstractions/INavigationAware.cs          |  1 +
 .../Abstractions/IRegionManager.cs            |  2 +-
 .../Abstractions/IViewNavigationHandler.cs    |  6 +--
 .../Abstractions/IViewNavigationService.cs    |  6 +--
 .../NavigationContext.cs                      | 45 ++++++++++++-------
 .../NavigationHandler.cs                      | 10 ++---
 .../NavigationService.cs                      | 10 ++---
 src/Lemon.ModuleNavigation/RegionManager.cs   |  4 +-
 15 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/samples/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs b/samples/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
index 00c01ef..b8427ca 100644
--- a/samples/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
+++ b/samples/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
@@ -47,8 +47,7 @@ public MainViewModel(IEnumerable<IModule> modules,
                 new NavigationParameters { { "requestNew", requestNew } });
             _navigationService.RequestViewNavigation("TabRegion", 
                 viewName, 
-                new NavigationParameters { { "requestNew", requestNew } },
-                $"alias-{viewName}");
+                new NavigationParameters { { "requestNew", requestNew } });
             _navigationService.RequestViewNavigation("ItemsRegion", 
                 viewName, 
                 new NavigationParameters { { "requestNew", requestNew } });
diff --git a/samples/Lemon.ModuleNavigation.SampleViewModel/BaseNavigationViewModel.cs b/samples/Lemon.ModuleNavigation.SampleViewModel/BaseNavigationViewModel.cs
index 6ea7573..ba00b90 100644
--- a/samples/Lemon.ModuleNavigation.SampleViewModel/BaseNavigationViewModel.cs
+++ b/samples/Lemon.ModuleNavigation.SampleViewModel/BaseNavigationViewModel.cs
@@ -8,7 +8,7 @@ namespace Lemon.ModuleNavigation.SampleViewModel;
 public class BaseNavigationViewModel : ReactiveObject, INavigationAware, ICanUnload
 {
     public virtual string Greeting => $"Welcome to {GetType().Name}[{Environment.ProcessId}][{Environment.CurrentManagedThreadId}]{Environment.NewLine}{DateTime.Now:yyyy-MM-dd HH-mm-ss.ffff}";
-
+    public virtual string? Alias => GetType().Name;
     public BaseNavigationViewModel()
     {
         UnloadViewCommand = ReactiveCommand.Create(() =>
diff --git a/samples/Lemon.ModuleNavigation.SampleViewModel/MainWindowViewModel.cs b/samples/Lemon.ModuleNavigation.SampleViewModel/MainWindowViewModel.cs
index a443695..4466298 100644
--- a/samples/Lemon.ModuleNavigation.SampleViewModel/MainWindowViewModel.cs
+++ b/samples/Lemon.ModuleNavigation.SampleViewModel/MainWindowViewModel.cs
@@ -33,7 +33,7 @@ public MainWindowViewModel(INavigationService navigationService,
 
             }
             _navigationService.RequestViewNavigation("ContentRegion", viewName, new NavigationParameters { { "requestNew", requestNew } });
-            _navigationService.RequestViewNavigation("TabRegion", viewName, new NavigationParameters { { "requestNew", requestNew } }, $"alias-{viewName}");
+            _navigationService.RequestViewNavigation("TabRegion", viewName, new NavigationParameters { { "requestNew", requestNew } });
             _navigationService.RequestViewNavigation("ItemsRegion", viewName, new NavigationParameters { { "requestNew", requestNew } });
         });
 
diff --git a/samples/Lemon.ModuleNavigation.SampleViewModel/ViewAlphaViewModel.cs b/samples/Lemon.ModuleNavigation.SampleViewModel/ViewAlphaViewModel.cs
index 9d70cb8..ee5dce6 100644
--- a/samples/Lemon.ModuleNavigation.SampleViewModel/ViewAlphaViewModel.cs
+++ b/samples/Lemon.ModuleNavigation.SampleViewModel/ViewAlphaViewModel.cs
@@ -11,6 +11,7 @@ public ViewAlphaViewModel()
     {
     }
 
+    public override string? Alias => "AlphaView";
     public string Title => nameof(ViewAlphaViewModel);
 
     public event Action<IDialogResult>? RequestClose;
diff --git a/samples/Lemon.ModuleNavigation.SampleViewModel/ViewBetaViewModel.cs b/samples/Lemon.ModuleNavigation.SampleViewModel/ViewBetaViewModel.cs
index 32a86b5..bc03bfb 100644
--- a/samples/Lemon.ModuleNavigation.SampleViewModel/ViewBetaViewModel.cs
+++ b/samples/Lemon.ModuleNavigation.SampleViewModel/ViewBetaViewModel.cs
@@ -8,7 +8,7 @@ namespace Lemon.ModuleNavigation.SampleViewModel;
 public class ViewBetaViewModel : BaseNavigationViewModel, IDialogAware
 {
     public string Title => nameof(ViewBetaViewModel);
-
+    public override string? Alias => "BetaView";
     public event Action<IDialogResult>? RequestClose;
     public ReactiveCommand<Unit, Unit> CloseCommand => ReactiveCommand.Create(() => 
     {
diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/Regions/Region.cs b/src/Lemon.ModuleNavigation.Avaloniaui/Regions/Region.cs
index 2899252..ffb8f7d 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/Regions/Region.cs
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/Regions/Region.cs
@@ -140,6 +140,7 @@ private IDataTemplate CreateRegionDataTemplate()
 
                 view.DataContext = navigationAware;
                 navigationAware.OnNavigatedTo(context);
+                context.Alias = navigationAware.Alias;
                 if (navigationAware is ICanUnload canUnloadNavigationAware)
                 {
                     canUnloadNavigationAware.RequestUnload += () =>
diff --git a/src/Lemon.ModuleNavigation.Wpf/Regions/Region.cs b/src/Lemon.ModuleNavigation.Wpf/Regions/Region.cs
index ed19e79..253d149 100644
--- a/src/Lemon.ModuleNavigation.Wpf/Regions/Region.cs
+++ b/src/Lemon.ModuleNavigation.Wpf/Regions/Region.cs
@@ -80,6 +80,7 @@ public virtual void ScrollIntoView(NavigationContext item)
 
             view.DataContext = navigationAware;
             navigationAware.OnNavigatedTo(context);
+            context.Alias = navigationAware.Alias;
             if (navigationAware is ICanUnload canUnloadNavigationAware)
             {
                 canUnloadNavigationAware.RequestUnload += () =>
diff --git a/src/Lemon.ModuleNavigation/Abstractions/INavigationAware.cs b/src/Lemon.ModuleNavigation/Abstractions/INavigationAware.cs
index f77ed78..e88db0c 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/INavigationAware.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/INavigationAware.cs
@@ -2,6 +2,7 @@
 
 public interface INavigationAware
 {
+    string? Alias { get; }
     void OnNavigatedTo(NavigationContext navigationContext);
     bool IsNavigationTarget(NavigationContext navigationContext);
     void OnNavigatedFrom(NavigationContext navigationContext);
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs b/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs
index 63c5942..5654132 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs
@@ -6,7 +6,7 @@ public interface IRegionManager : IObservable<NavigationContext>, IObservable<IR
 {
     void AddRegion(string regionName, IRegion region);
     IRegion? GetRegion(string regionName);
-    void RequestViewNavigate(string regionName, string viewName, NavigationParameters? parameters = null, string? alias = null);
+    void RequestViewNavigate(string regionName, string viewName, NavigationParameters? parameters = null);
     [Obsolete("requestNew was obsolete.Consider IsNavigationTarget() in INavigationAware instead.")]
     void RequestNavigate(string regionName, string viewName, bool requestNew, NavigationParameters? parameters = null);
     void RequestViewUnload(string regionName, string viewName);
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationHandler.cs b/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationHandler.cs
index 31c2209..d74c595 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationHandler.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationHandler.cs
@@ -5,12 +5,10 @@ namespace Lemon.ModuleNavigation.Abstractions;
 public interface IViewNavigationHandler
 {
     void OnNavigateTo(string regionName, 
-        string viewName,
-        string? alias = null);
+        string viewName);
     void OnNavigateTo(string regionName, 
         string viewName,
-        NavigationParameters parameters,
-        string? alias = null);
+        NavigationParameters parameters);
     void OnViewUnload(string regionName,
         string viewName);
 }
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationService.cs b/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationService.cs
index 4554ae0..c05cafd 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationService.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationService.cs
@@ -20,8 +20,7 @@ void RequestViewNavigation(string regionName,
         bool requestNew);
 
     void RequestViewNavigation(string regionName,
-        string viewName, 
-        string? alias = null);
+        string viewName);
 
     /// <summary>
     /// RequestViewNavigation
@@ -41,8 +40,7 @@ void RequestViewNavigation(string regionName,
 
     void RequestViewNavigation(string regionName,
         string viewName,
-        NavigationParameters parameters,
-        string? alias = null);
+        NavigationParameters parameters);
 
     /// <summary>
     /// RequestViewUnload
diff --git a/src/Lemon.ModuleNavigation/NavigationContext.cs b/src/Lemon.ModuleNavigation/NavigationContext.cs
index 6e526b4..1a23981 100644
--- a/src/Lemon.ModuleNavigation/NavigationContext.cs
+++ b/src/Lemon.ModuleNavigation/NavigationContext.cs
@@ -1,12 +1,14 @@
 using Lemon.ModuleNavigation.Abstractions;
 using Lemon.ModuleNavigation.Core;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
 
 namespace Lemon.ModuleNavigation;
 
-public class NavigationContext
+public class NavigationContext : INotifyPropertyChanged
 {
     [Obsolete("requestNew was obsolete.Consider IsNavigationTarget() in INavigationAware instead.")]
-    internal NavigationContext(string viewName, 
+    internal NavigationContext(string viewName,
         string regionName,
         IServiceProvider serviceProvider,
         bool requestNew,
@@ -21,32 +23,35 @@ internal NavigationContext(string viewName,
     internal NavigationContext(string viewName,
         string regionName,
         IServiceProvider serviceProvider,
-        NavigationParameters? navigationParameters,
-        string? alias)
+        NavigationParameters? navigationParameters)
     {
         ViewName = viewName;
         Parameters = navigationParameters;
         RegionName = regionName;
         ServiceProvider = serviceProvider;
-        Alias = alias;
     }
     public static ViewNameComparer ViewNameComparer => new();
     public static StrictComparer StrictComparer => new();
-    public string ViewName 
-    { 
-        get; 
-        private set; 
+    public string ViewName
+    {
+        get;
+        private set;
     }
+    private string? _alias;
     public string? Alias
+    {
+        get => _alias;
+        set
+        {
+            _alias = value;
+            OnPropertyChanged();
+        }
+    }
+    public NavigationParameters? Parameters
     {
         get;
         private set;
     }
-    public NavigationParameters? Parameters 
-    { 
-        get; 
-        private set; 
-    }
     [Obsolete("requestNew was obsolete.Consider IsNavigationTarget() in INavigationAware instead.")]
     public bool RequestNew
     {
@@ -54,9 +59,9 @@ public bool RequestNew
         private set;
     }
     public string RegionName
-    { 
-        get; 
-        private set; 
+    {
+        get;
+        private set;
     }
     public int Key => GetHashCode();
     public IServiceProvider ServiceProvider
@@ -72,6 +77,12 @@ public override string ToString()
     {
         return $"{RegionName}.{ViewName}";
     }
+
+    public event PropertyChangedEventHandler? PropertyChanged;
+    protected void OnPropertyChanged([CallerMemberName] string? propertyName = null)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
 }
 public class ViewNameComparer : IEqualityComparer<NavigationContext>
 {
diff --git a/src/Lemon.ModuleNavigation/NavigationHandler.cs b/src/Lemon.ModuleNavigation/NavigationHandler.cs
index 6d19f44..da2d2bb 100644
--- a/src/Lemon.ModuleNavigation/NavigationHandler.cs
+++ b/src/Lemon.ModuleNavigation/NavigationHandler.cs
@@ -33,17 +33,15 @@ public void OnNavigateTo(string moduleKey, NavigationParameters? parameters)
         _moduleManager.RequestNavigate(moduleKey, parameters);
     }
     public void OnNavigateTo(string regionName,
-         string viewName,
-         string? alias = null)
+         string viewName)
     {
-        RegionManager.RequestViewNavigate(regionName, viewName, null, alias);
+        RegionManager.RequestViewNavigate(regionName, viewName, null);
     }
     public void OnNavigateTo(string regionName,
         string viewName,
-        NavigationParameters navigationParameters,
-        string? alias = null)
+        NavigationParameters navigationParameters)
     {
-        RegionManager.RequestViewNavigate(regionName, viewName, navigationParameters, alias);
+        RegionManager.RequestViewNavigate(regionName, viewName, navigationParameters);
     }
 
     public void OnViewUnload(string regionName, string viewName)
diff --git a/src/Lemon.ModuleNavigation/NavigationService.cs b/src/Lemon.ModuleNavigation/NavigationService.cs
index 697ad4c..502402f 100644
--- a/src/Lemon.ModuleNavigation/NavigationService.cs
+++ b/src/Lemon.ModuleNavigation/NavigationService.cs
@@ -40,23 +40,21 @@ public void RequestModuleNavigate(string moduleName, NavigationParameters? param
         _bufferModuleName.Push((moduleName, parameters));
     }
     public void RequestViewNavigation(string regionName,
-       string viewName,
-       string? alias = null)
+       string viewName)
     {
         foreach (var handler in _viewHandlers)
         {
-            handler.OnNavigateTo(regionName, viewName, alias);
+            handler.OnNavigateTo(regionName, viewName);
         }
         _bufferViewName.Push((regionName, viewName, null));
     }
     public void RequestViewNavigation(string regionName,
         string viewName,
-        NavigationParameters parameters,
-        string? alias = null)
+        NavigationParameters parameters)
     {
         foreach (var handler in _viewHandlers)
         {
-            handler.OnNavigateTo(regionName, viewName, parameters, alias);
+            handler.OnNavigateTo(regionName, viewName, parameters);
         }
         _bufferViewName.Push((regionName, viewName, parameters));
     }
diff --git a/src/Lemon.ModuleNavigation/RegionManager.cs b/src/Lemon.ModuleNavigation/RegionManager.cs
index 30fd7c3..a26575d 100644
--- a/src/Lemon.ModuleNavigation/RegionManager.cs
+++ b/src/Lemon.ModuleNavigation/RegionManager.cs
@@ -41,9 +41,9 @@ public void RequestNavigate(string regionName, string viewName, bool requestNew,
                 });
         }
     }
-    public void RequestViewNavigate(string regionName, string viewName, NavigationParameters? parameters = null, string? alias = null)
+    public void RequestViewNavigate(string regionName, string viewName, NavigationParameters? parameters = null)
     {
-        var context = new NavigationContext(viewName, regionName, _serviceProvider, parameters, alias);
+        var context = new NavigationContext(viewName, regionName, _serviceProvider, parameters);
         if (_regions.TryGetValue(regionName, out var region))
         {
             region.Activate(context);

From 8522280dba6f5555a8452458a99bb8c10e4f4f1b Mon Sep 17 00:00:00 2001
From: Easley <nevermore.wd@me.com>
Date: Mon, 28 Jul 2025 10:15:52 +0800
Subject: [PATCH 4/5] 
 https://github.com/NeverMorewd/Lemon.ModuleNavigation/issues/58

---
 .../Regions/Region.cs                         | 53 +++++++------------
 1 file changed, 20 insertions(+), 33 deletions(-)

diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/Regions/Region.cs b/src/Lemon.ModuleNavigation.Avaloniaui/Regions/Region.cs
index ffb8f7d..e1b0a10 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/Regions/Region.cs
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/Regions/Region.cs
@@ -68,18 +68,15 @@ public virtual void ScrollIntoView(NavigationContext item)
     protected IView? ResolveView(NavigationContext context)
     {
         var view = context.View;
+        INavigationAware? navigationAware = null;
+
         if (view is null)
         {
             view = context.ServiceProvider.GetRequiredKeyedService<IView>(context.ViewName);
-            var navigationAware = context.ServiceProvider.GetRequiredKeyedService<INavigationAware>(context.ViewName);
-
-            if (Current.TryTakeData(out var previousData))
-            {
-                previousData.NavigationAware.OnNavigatedFrom(context);
-            }
+            navigationAware = context.ServiceProvider.GetRequiredKeyedService<INavigationAware>(context.ViewName);
 
             view.DataContext = navigationAware;
-            navigationAware.OnNavigatedTo(context);
+
             if (navigationAware is ICanUnload canUnloadNavigationAware)
             {
                 canUnloadNavigationAware.RequestUnload += () =>
@@ -87,10 +84,24 @@ public virtual void ScrollIntoView(NavigationContext item)
                     DeActivate(context);
                 };
             }
-            Current.SetData((view, navigationAware));
+
             context.View = view;
             ViewCache.AddOrUpdate(context, view, (key, value) => view);
         }
+        else
+        {
+            navigationAware = view.DataContext as INavigationAware
+                ?? context.ServiceProvider.GetRequiredKeyedService<INavigationAware>(context.ViewName);
+        }
+        if (Current.TryTakeData(out var previousData))
+        {
+            previousData.NavigationAware.OnNavigatedFrom(context);
+        }
+
+        navigationAware.OnNavigatedTo(context);
+
+        Current.SetData((view, navigationAware));
+        context.Alias = navigationAware.Alias;
         return view;
     }
 
@@ -127,31 +138,7 @@ private IDataTemplate CreateRegionDataTemplate()
             {
                 return null;
             }
-            var view = context.View;
-            if (view is null)
-            {
-                view = context.ServiceProvider.GetRequiredKeyedService<IView>(context.ViewName);
-                var navigationAware = context.ServiceProvider.GetRequiredKeyedService<INavigationAware>(context.ViewName);
-
-                if (Current.TryTakeData(out var previousData))
-                {
-                    previousData.NavigationAware.OnNavigatedFrom(context);
-                }
-
-                view.DataContext = navigationAware;
-                navigationAware.OnNavigatedTo(context);
-                context.Alias = navigationAware.Alias;
-                if (navigationAware is ICanUnload canUnloadNavigationAware)
-                {
-                    canUnloadNavigationAware.RequestUnload += () =>
-                    {
-                        DeActivate(context);
-                    };
-                }
-                Current.SetData((view, navigationAware));
-                context.View = view;
-                ViewCache.AddOrUpdate(context, view, (key, value) => view);
-            }
+            var view = ResolveView(context);
             return view as Control;
         });
     }

From 2c2e0433c15a80bb07470cc363396f6bf7884ceb Mon Sep 17 00:00:00 2001
From: Easley <nevermore.wd@me.com>
Date: Mon, 28 Jul 2025 10:53:50 +0800
Subject: [PATCH 5/5] bump verson

---
 src/Package.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Package.props b/src/Package.props
index d140588..499a015 100644
--- a/src/Package.props
+++ b/src/Package.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <Version>2.1.2-rc</Version>
+        <Version>2.2.0</Version>
         <Authors>Easley</Authors>
         <RepositoryUrl>https://github.com/NeverMorewd/Lemon.ModuleNavigation</RepositoryUrl>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>