From c413fa10260e1964aedec291e7e1e883760f4910 Mon Sep 17 00:00:00 2001
From: nevermore <nevermore.wd@me.com>
Date: Sat, 29 Mar 2025 14:42:42 +0800
Subject: [PATCH 01/15] Update release.yml

fix nuget path on windows
---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 52df96d..8b6dead 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -75,7 +75,7 @@ jobs:
       - name: Publish WPF NuGet package
         run: |
           if (Test-Path "./nugets/*.nupkg") {
-            dotnet nuget push "./nugets/*.nupkg" --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
+            dotnet nuget push ".\nugets\*.nupkg" --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
           }
 
       - name: Upload WPF NuGet Artifact

From 5c4fc4d4edbda5e15f6d71072c18028510866b51 Mon Sep 17 00:00:00 2001
From: Easley <nevermore.wd@me.com>
Date: Sat, 29 Mar 2025 17:26:05 +0800
Subject: [PATCH 02/15] uncomplete

---
 .../ContentRegion.cs                          | 25 ++++++++--
 .../ItemsRegion.cs                            | 12 +++--
 .../NavigationExtension.cs                    | 26 +++++++---
 .../{AvaloniauiRegion.cs => Region.cs}        |  5 +-
 .../RegionsExtension.cs                       |  2 +-
 .../TabRegion.cs                              | 50 +++++++++++++++----
 .../Views/ViewAlpha.axaml                     |  7 +++
 .../ContentRegion.cs                          | 23 ++++++++-
 src/Lemon.ModuleNavigation.Wpf/ItemsRegion.cs | 10 ++--
 .../NavigationExtension.cs                    | 16 +++---
 src/Lemon.ModuleNavigation.Wpf/Region.cs      |  1 +
 src/Lemon.ModuleNavigation.Wpf/TabRegion.cs   | 11 +++-
 .../MainWindow.xaml                           |  1 +
 .../Abstractions/IRegion.cs                   |  3 ++
 .../Abstractions/IRegionManager.cs            |  2 +
 .../Abstractions/IViewNavigationHandler.cs    |  2 +
 .../Abstractions/IViewNavigationService.cs    |  6 ++-
 .../Core/RegionNameNotFoundException.cs       |  9 ++++
 .../NavigationContext.cs                      |  2 +-
 .../NavigationHandler.cs                      |  5 ++
 .../NavigationService.cs                      | 21 +++++---
 src/Lemon.ModuleNavigation/RegionManager.cs   | 24 +++++++++
 22 files changed, 214 insertions(+), 49 deletions(-)
 rename src/Lemon.ModuleNavigation.Avaloniaui/{AvaloniauiRegion.cs => Region.cs} (95%)
 create mode 100644 src/Lemon.ModuleNavigation/Core/RegionNameNotFoundException.cs

diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/ContentRegion.cs b/src/Lemon.ModuleNavigation.Avaloniaui/ContentRegion.cs
index c2973b3..5b9e49b 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/ContentRegion.cs
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/ContentRegion.cs
@@ -4,7 +4,7 @@
 
 namespace Lemon.ModuleNavigation.Avaloniaui;
 
-public class ContentRegion : AvaloniauiRegion
+public class ContentRegion : Region
 {
     private readonly ContentControl _contentControl;
     public ContentRegion(ContentControl contentControl, string name) : base()
@@ -44,11 +44,30 @@ public override void Activate(NavigationContext target)
             }
         }
         Content = target;
+        Contexts.Add(target);
     }
 
-    public override void DeActivate(NavigationContext target)
+    public override void DeActivate(string regionName)
     {
-        Content = null;
+        if (Content is NavigationContext current)
+        {
+            if (current.TargetViewName == regionName)
+            {
+                Contexts.Remove(current);
+                Content = null;
+            }
+        }
+    }
+    public override void DeActivate(NavigationContext navigationContext)
+    {
+        if (Content is NavigationContext current)
+        {
+            if (current == navigationContext)
+            {
+                Contexts.Remove(current);
+                Content = null;
+            }
+        }
     }
     private void ViewContents_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
     {
diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/ItemsRegion.cs b/src/Lemon.ModuleNavigation.Avaloniaui/ItemsRegion.cs
index 30d4eea..968961e 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/ItemsRegion.cs
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/ItemsRegion.cs
@@ -5,7 +5,7 @@
 
 namespace Lemon.ModuleNavigation.Avaloniaui;
 
-public class ItemsRegion : AvaloniauiRegion
+public class ItemsRegion : Region
 {
     private readonly ItemsControl _itemsControl;
     public ItemsRegion(ItemsControl itemsControl, string name)
@@ -84,9 +84,13 @@ public override void Activate(NavigationContext target)
             SelectedItem = target;
         }
     }
-    public override void DeActivate(NavigationContext target)
+    public override void DeActivate(string viewName)
     {
-        Contexts.Remove(target);
+        Contexts.Remove(Contexts.Last(c => c.TargetViewName == viewName));
+    }
+    public override void DeActivate(NavigationContext navigationContext)
+    {
+        Contexts.Remove(navigationContext);
     }
     public void Add(NavigationContext item)
     {
@@ -110,7 +114,7 @@ private void ViewContents_CollectionChanged(object? sender, NotifyCollectionChan
             {
                 foreach (var item in e.OldItems)
                 {
-                    _itemsControl.Items.Remove(e.OldItems);
+                    _itemsControl.Items.Remove(item);
                 }
             }
         }
diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/NavigationExtension.cs b/src/Lemon.ModuleNavigation.Avaloniaui/NavigationExtension.cs
index 19f3fcc..6608ecd 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/NavigationExtension.cs
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/NavigationExtension.cs
@@ -36,7 +36,7 @@ void LoadedHandler(object? sender, RoutedEventArgs e)
                     {
                         var serviceProvider = navigationProvider!.ServiceProvider;
                         var handler = serviceProvider.GetRequiredService<INavigationHandler>();
-                        handler.RegionManager.AddRegion(currentValue, control.ToContainer(currentValue));
+                        handler.RegionManager.AddRegion(currentValue, control.ToRegion(currentValue));
                     }
                     control.Loaded -= LoadedHandler;
                 }
@@ -112,7 +112,7 @@ public static void SetModuleContainerName(Control control, string value)
     #region CanUnloadProperty
     public static readonly AttachedProperty<bool> CanUnloadProperty =
            AvaloniaProperty.RegisterAttached<NavigationExtension, Button, bool>("CanUnload",
-               defaultValue: true,
+               defaultValue: false,
                coerce: CoerceCanUnload);
 
     private static bool CoerceCanUnload(AvaloniaObject targetObject, bool currentValue)
@@ -160,17 +160,31 @@ private static void UnloadModule(object? sender, RoutedEventArgs e)
     {
         if (sender is Button button)
         {
+            var view = button.FindLogicalAncestorOfType<IView>(includeSelf: false);
+            if (view != null)
+            {
+            }
             var tabItem = button.FindLogicalAncestorOfType<TabItem>(includeSelf: false) ?? throw new InvalidOperationException($"There is no 'TabItem' found in parents of {button}");
             var tabContainer = tabItem.FindLogicalAncestorOfType<TabControl>(includeSelf: false);
             if (tabContainer != null)
             {
-                IModule item = tabItem.DataContext as IModule ?? throw new InvalidOperationException($"The DataContext of tabItem is not derived from IModule");
-                if (item.CanUnload)
+                if (tabItem.DataContext is IModule item)
+                {
+                    if (item.CanUnload)
+                    {
+                        if (tabContainer.DataContext is IServiceAware serviceAware)
+                        {
+                            var handler = serviceAware.ServiceProvider.GetRequiredService<INavigationHandler>();
+                            handler.ModuleManager.ActiveModules.Remove(item);
+                        }
+                    }
+                }
+                else if (tabItem.DataContext is NavigationContext navigationContext)
                 {
                     if (tabContainer.DataContext is IServiceAware serviceAware)
                     {
-                        var handler = serviceAware.ServiceProvider.GetRequiredService<INavigationHandler>();
-                        handler.ModuleManager.ActiveModules.Remove(item);
+                        var regionManager = serviceAware.ServiceProvider.GetRequiredService<IRegionManager>();
+                        regionManager.RequestUnload(navigationContext);
                     }
                 }
             }
diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/AvaloniauiRegion.cs b/src/Lemon.ModuleNavigation.Avaloniaui/Region.cs
similarity index 95%
rename from src/Lemon.ModuleNavigation.Avaloniaui/AvaloniauiRegion.cs
rename to src/Lemon.ModuleNavigation.Avaloniaui/Region.cs
index a07d3c0..942cc98 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/AvaloniauiRegion.cs
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/Region.cs
@@ -8,12 +8,12 @@
 
 namespace Lemon.ModuleNavigation.Avaloniaui;
 
-public abstract class AvaloniauiRegion : IRegion
+public abstract class Region : IRegion
 {
     private readonly ConcurrentDictionary<string, IView> _viewCache = new();
     private readonly ConcurrentItem<(IView View, INavigationAware NavigationAware)> _current = new();
 
-    public AvaloniauiRegion()
+    public Region()
     {
         RegionTemplate = CreateRegionDataTemplate();
     }
@@ -24,6 +24,7 @@ public AvaloniauiRegion()
     public IDataTemplate? RegionTemplate { get; set; }
 
     public abstract void Activate(NavigationContext target);
+    public abstract void DeActivate(string viewName);
     public abstract void DeActivate(NavigationContext target);
 
     private IDataTemplate CreateRegionDataTemplate()
diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/RegionsExtension.cs b/src/Lemon.ModuleNavigation.Avaloniaui/RegionsExtension.cs
index 19782bc..f352fb1 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/RegionsExtension.cs
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/RegionsExtension.cs
@@ -5,7 +5,7 @@ namespace Lemon.ModuleNavigation.Avaloniaui;
 
 public static class RegionsExtension
 {
-    public static IRegion ToContainer(this Control control, string name) 
+    public static IRegion ToRegion(this Control control, string name) 
     {
         return control switch
         {
diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/TabRegion.cs b/src/Lemon.ModuleNavigation.Avaloniaui/TabRegion.cs
index 5b5b460..e6c39d3 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/TabRegion.cs
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/TabRegion.cs
@@ -1,40 +1,64 @@
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Data;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
 
 namespace Lemon.ModuleNavigation.Avaloniaui;
 
-public class TabRegion : AvaloniauiRegion
+public class TabRegion : Region, INotifyPropertyChanged
 {
     private readonly TabControl _tabControl;
-    public TabRegion(TabControl tabControl, string name)
+     public TabRegion(TabControl tabControl, string name)
     {
         _tabControl = tabControl;
-        _tabControl.ContentTemplate = RegionTemplate;
         Contexts = [];
-        Contexts.CollectionChanged += ViewContents_CollectionChanged;
+        //Contexts.CollectionChanged += ViewContents_CollectionChanged;
+
+
+        _tabControl.Bind(SelectingItemsControl.SelectedItemProperty,
+                               new Binding(nameof(SelectedItem))
+                               {
+                                   Mode = BindingMode.TwoWay,
+                                   Source = this
+                               });
+        _tabControl.Bind(ItemsControl.ItemsSourceProperty,
+                            new Binding(nameof(Contexts))
+                            {
+                                Source = this
+                            });
+        _tabControl.ContentTemplate = RegionTemplate;
+
         Name = name;
     }
     public override string Name
     {
         get;
     }
-    public object? SelectedItem
+    private NavigationContext? _selectItem;
+    public NavigationContext? SelectedItem
     {
         get
         {
-            return _tabControl.SelectedItem;
+            return _selectItem;
         }
         set
         {
-            _tabControl.SelectedItem = value;
+            _selectItem = value;
+            OnPropertyChanged();
         }
     }
     public override ObservableCollection<NavigationContext> Contexts
     {
         get;
     }
-
+    public event PropertyChangedEventHandler? PropertyChanged;
+    protected void OnPropertyChanged([CallerMemberName] string? propertyName = null)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
     public override void Activate(NavigationContext target)
     {
         if (!target.RequestNew)
@@ -63,9 +87,13 @@ public override void Activate(NavigationContext target)
             SelectedItem = target;
         }
     }
-    public override void DeActivate(NavigationContext target)
+    public override void DeActivate(string viewName)
+    {
+        Contexts.Remove(Contexts.Last(c => c.TargetViewName == viewName));
+    }
+    public override void DeActivate(NavigationContext navigationContext)
     {
-        Contexts.Remove(target);
+        Contexts.Remove(navigationContext);
     }
     public void Add(NavigationContext item)
     {
@@ -89,7 +117,7 @@ private void ViewContents_CollectionChanged(object? sender, NotifyCollectionChan
             {
                 foreach (var item in e.OldItems)
                 {
-                    _tabControl.Items.Remove(e.OldItems);
+                    _tabControl.Items.Remove(item);
                 }
             }
         }
diff --git a/src/Lemon.ModuleNavigation.Sample/Views/ViewAlpha.axaml b/src/Lemon.ModuleNavigation.Sample/Views/ViewAlpha.axaml
index f10423d..d5bc2d4 100644
--- a/src/Lemon.ModuleNavigation.Sample/Views/ViewAlpha.axaml
+++ b/src/Lemon.ModuleNavigation.Sample/Views/ViewAlpha.axaml
@@ -4,6 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:lm="https://github.com/NeverMorewd/Lemon.ModuleNavigation"
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
@@ -16,6 +17,12 @@
                 Command="{Binding CloseCommand}"
                 Content="CloseDialog"
                 IsVisible="{Binding IsDialog}" />
+			<Button
+			   Width="200"
+			   Height="50"
+			   lm:NavigationExtension.CanUnload="True"
+			   Content="UnloadView"
+			   IsVisible="{Binding !IsDialog}" />
         </StackPanel>
     </Border>
 </UserControl>
diff --git a/src/Lemon.ModuleNavigation.Wpf/ContentRegion.cs b/src/Lemon.ModuleNavigation.Wpf/ContentRegion.cs
index c30f171..5bf8f07 100644
--- a/src/Lemon.ModuleNavigation.Wpf/ContentRegion.cs
+++ b/src/Lemon.ModuleNavigation.Wpf/ContentRegion.cs
@@ -44,11 +44,30 @@ public override void Activate(NavigationContext target)
                 }
             }
             Content = target;
+            Contexts.Add(target);
         }
 
-        public override void DeActivate(NavigationContext target)
+        public override void DeActivate(string regionName)
         {
-            Content = null;
+            if (Content is NavigationContext current)
+            {
+                if (current.TargetViewName == regionName)
+                {
+                    Contexts.Remove(current);
+                    Content = null;
+                }
+            }
+        }
+        public override void DeActivate(NavigationContext navigationContext)
+        {
+            if (Content is NavigationContext current)
+            {
+                if (current == navigationContext)
+                {
+                    Contexts.Remove(current);
+                    Content = null;
+                }
+            }
         }
         private void ViewContents_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
         {
diff --git a/src/Lemon.ModuleNavigation.Wpf/ItemsRegion.cs b/src/Lemon.ModuleNavigation.Wpf/ItemsRegion.cs
index a1e313f..86cb830 100644
--- a/src/Lemon.ModuleNavigation.Wpf/ItemsRegion.cs
+++ b/src/Lemon.ModuleNavigation.Wpf/ItemsRegion.cs
@@ -83,9 +83,13 @@ public override void Activate(NavigationContext target)
             SelectedItem = target;
         }
     }
-    public override void DeActivate(NavigationContext target)
+    public override void DeActivate(string viewName)
     {
-        Contexts.Remove(target);
+        Contexts.Remove(Contexts.Last(c => c.TargetViewName == viewName));
+    }
+    public override void DeActivate(NavigationContext navigationContext)
+    {
+        Contexts.Remove(navigationContext);
     }
     public void Add(NavigationContext item)
     {
@@ -109,7 +113,7 @@ private void ViewContents_CollectionChanged(object? sender, NotifyCollectionChan
             {
                 foreach (var item in e.OldItems)
                 {
-                    _itemsControl.Items.Remove(e.OldItems);
+                    _itemsControl.Items.Remove(item);
                 }
             }
         }
diff --git a/src/Lemon.ModuleNavigation.Wpf/NavigationExtension.cs b/src/Lemon.ModuleNavigation.Wpf/NavigationExtension.cs
index 268d013..93ea194 100644
--- a/src/Lemon.ModuleNavigation.Wpf/NavigationExtension.cs
+++ b/src/Lemon.ModuleNavigation.Wpf/NavigationExtension.cs
@@ -2,6 +2,8 @@
 using Microsoft.Extensions.DependencyInjection;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Diagnostics;
+using System.Windows.Media;
 
 namespace Lemon.ModuleNavigation.Wpf;
 
@@ -54,11 +56,11 @@ public static string GetRegionName(Control element)
     }
     #endregion
 
-    #region CanUnload -- ongoing
+    #region CanUnload -- ongoing support tabcontrol only for now
     public static readonly DependencyProperty CanUnloadProperty =
         DependencyProperty.RegisterAttached(
             "CanUnload", typeof(bool), typeof(NavigationExtension),
-            new PropertyMetadata(true, OnCanUnloadChanged));
+            new PropertyMetadata(false, OnCanUnloadChanged));
 
     public static bool GetCanUnload(DependencyObject obj) => (bool)obj.GetValue(CanUnloadProperty);
     public static void SetCanUnload(DependencyObject obj, bool value) => obj.SetValue(CanUnloadProperty, value);
@@ -109,13 +111,15 @@ private static void UnloadModule(object sender, RoutedEventArgs e)
                           throw new InvalidOperationException($"No 'TabItem' found in parents of {button}");
 
             var tabContainer = FindAncestor<TabControl>(tabItem);
-            if (tabContainer != null)
+             if (tabContainer != null) 
             {
-                if (tabItem.DataContext is INavigationAware item)
+                if (tabItem.DataContext is NavigationContext context)
                 {
                     if (tabContainer.DataContext is IServiceAware serviceAware)
                     {
-                        var handler = serviceAware.ServiceProvider.GetRequiredService<INavigationHandler>();
+                        var regionManager = serviceAware.ServiceProvider.GetRequiredService<IRegionManager>();
+                        //regionManager.RequestUnload(context.RegionName, context.TargetViewName);
+                        regionManager.RequestUnload(context);
                     }
                 }
             }
@@ -128,7 +132,7 @@ private static void UnloadModule(object sender, RoutedEventArgs e)
         {
             if (current is T ancestor)
                 return ancestor;
-            current = LogicalTreeHelper.GetParent(current);
+            current = VisualTreeHelper.GetParent(current);
         }
         return null;
     }
diff --git a/src/Lemon.ModuleNavigation.Wpf/Region.cs b/src/Lemon.ModuleNavigation.Wpf/Region.cs
index 906c6d0..9a4ea1b 100644
--- a/src/Lemon.ModuleNavigation.Wpf/Region.cs
+++ b/src/Lemon.ModuleNavigation.Wpf/Region.cs
@@ -24,6 +24,7 @@ public Region()
     public DataTemplate? RegionTemplate { get; set; }
 
     public abstract void Activate(NavigationContext target);
+    public abstract void DeActivate(string viewName);
     public abstract void DeActivate(NavigationContext target);
 
     private DataTemplate CreateRegionDataTemplate()
diff --git a/src/Lemon.ModuleNavigation.Wpf/TabRegion.cs b/src/Lemon.ModuleNavigation.Wpf/TabRegion.cs
index 3865ab1..28e047b 100644
--- a/src/Lemon.ModuleNavigation.Wpf/TabRegion.cs
+++ b/src/Lemon.ModuleNavigation.Wpf/TabRegion.cs
@@ -1,6 +1,7 @@
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Windows.Controls;
+using System.Windows.Data;
 
 namespace Lemon.ModuleNavigation.Wpf;
 
@@ -9,6 +10,8 @@ public class TabRegion : Region
     private readonly TabControl _tabControl;
     public TabRegion(TabControl tabControl, string name)
     {
+
+
         _tabControl = tabControl;
         _tabControl.ContentTemplate = RegionTemplate;
         Contexts = [];
@@ -63,9 +66,13 @@ public override void Activate(NavigationContext target)
             SelectedItem = target;
         }
     }
-    public override void DeActivate(NavigationContext target)
+    public override void DeActivate(string viewName)
+    {
+        Contexts.Remove(Contexts.Last(c => c.TargetViewName == viewName));
+    }
+    public override void DeActivate(NavigationContext navigationContext)
     {
-        Contexts.Remove(target);
+        Contexts.Remove(navigationContext);
     }
     public void Add(NavigationContext item)
     {
diff --git a/src/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml b/src/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml
index 332a5ce..56937b3 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml
+++ b/src/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml
@@ -57,6 +57,7 @@
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock Text="{Binding}" />
                                         <Button
+                                            lm:NavigationExtension.CanUnload="True"
                                             Width="20"
                                             Height="20"
                                             Padding="-1,0,0,0"
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IRegion.cs b/src/Lemon.ModuleNavigation/Abstractions/IRegion.cs
index ed724b3..73e9e1d 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IRegion.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IRegion.cs
@@ -12,5 +12,8 @@ ObservableCollection<NavigationContext> Contexts
         }
         void Activate(NavigationContext target);
         void DeActivate(NavigationContext target);
+        void DeActivate(string viewName);
+
+        ///ongoing: last view
     }
 }
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs b/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs
index 52c6558..5e52ea5 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs
@@ -8,5 +8,7 @@ public interface IRegionManager: IObservable<NavigationContext>, IObservable<IRe
         void AddRegion(string regionName, IRegion region);
         IRegion? GetRegion(string regionName);
         void RequestNavigate(string regionName, string viewName, bool requestNae, NavigationParameters? parameters = null);
+        void RequestUnload(string regionName, string viewName);
+        void RequestUnload(NavigationContext context);
     }
 }
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationHandler.cs b/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationHandler.cs
index ecf3dc3..9efd18d 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationHandler.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationHandler.cs
@@ -11,4 +11,6 @@ void OnNavigateTo(string regionName,
         string viewName,
         NavigationParameters parameters,
         bool requestNew);
+    void OnViewUnload(string regionName,
+        string viewName);
 }
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationService.cs b/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationService.cs
index 18af02b..a9b86b9 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationService.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationService.cs
@@ -6,10 +6,12 @@ public interface IViewNavigationService
 {
     IDisposable BindingViewNavigationHandler(IViewNavigationHandler handler);
     void RequestViewNavigation(string regionName, 
-        string viewKey, 
+        string viewName, 
         bool requestNew = false);
     void RequestViewNavigation(string regionName,
-        string viewKey,
+        string viewName,
         NavigationParameters parameters,
         bool requestNew = false);
+    void RequestViewUnload(string regionName,
+       string viewName);
 }
diff --git a/src/Lemon.ModuleNavigation/Core/RegionNameNotFoundException.cs b/src/Lemon.ModuleNavigation/Core/RegionNameNotFoundException.cs
new file mode 100644
index 0000000..50ef332
--- /dev/null
+++ b/src/Lemon.ModuleNavigation/Core/RegionNameNotFoundException.cs
@@ -0,0 +1,9 @@
+namespace Lemon.ModuleNavigation.Core;
+
+public class RegionNameNotFoundException : Exception
+{
+    public RegionNameNotFoundException(string regionName) : base($"{regionName} was not found!")
+    {
+        
+    }
+}
diff --git a/src/Lemon.ModuleNavigation/NavigationContext.cs b/src/Lemon.ModuleNavigation/NavigationContext.cs
index 6bdd567..2710905 100644
--- a/src/Lemon.ModuleNavigation/NavigationContext.cs
+++ b/src/Lemon.ModuleNavigation/NavigationContext.cs
@@ -52,7 +52,7 @@ public IServiceProvider ServiceProvider
     }
     public override string ToString()
     {
-        return TargetViewName;
+        return $"{RegionName}.{TargetViewName}";
     }
 }
 public class ViewNameComparer : IEqualityComparer<NavigationContext>
diff --git a/src/Lemon.ModuleNavigation/NavigationHandler.cs b/src/Lemon.ModuleNavigation/NavigationHandler.cs
index d1cee33..cb9d6ab 100644
--- a/src/Lemon.ModuleNavigation/NavigationHandler.cs
+++ b/src/Lemon.ModuleNavigation/NavigationHandler.cs
@@ -46,6 +46,11 @@ public void OnNavigateTo(string regionName,
         RegionManager.RequestNavigate(regionName, viewName, requestNew, navigationParameters);
     }
 
+    public void OnViewUnload(string regionName, string viewName)
+    {
+        RegionManager.RequestUnload(regionName, viewName);
+    }
+
     void IDisposable.Dispose()
     {
         _cleanup1?.Dispose();
diff --git a/src/Lemon.ModuleNavigation/NavigationService.cs b/src/Lemon.ModuleNavigation/NavigationService.cs
index 10efd8f..959bfb5 100644
--- a/src/Lemon.ModuleNavigation/NavigationService.cs
+++ b/src/Lemon.ModuleNavigation/NavigationService.cs
@@ -40,26 +40,35 @@ public void RequestModuleNavigate(string moduleName, NavigationParameters parame
         _bufferModuleName.Push((moduleName, parameters));
     }
     public void RequestViewNavigation(string regionName,
-        string viewKey,
+        string viewName,
         bool requestNew = false)
     {
         foreach (var handler in _viewHandlers)
         {
-            handler.OnNavigateTo(regionName, viewKey, requestNew);
+            handler.OnNavigateTo(regionName, viewName, requestNew);
         }
-        _bufferViewName.Push((regionName, viewKey, null, requestNew));
+        _bufferViewName.Push((regionName, viewName, null, requestNew));
     }
     public void RequestViewNavigation(string regionName,
-        string viewKey,
+        string viewName,
         NavigationParameters parameters,
         bool requestNew = false)
     {
         foreach (var handler in _viewHandlers)
         {
-            handler.OnNavigateTo(regionName, viewKey, parameters, requestNew);
+            handler.OnNavigateTo(regionName, viewName, parameters, requestNew);
         }
-        _bufferViewName.Push((regionName, viewKey, parameters, requestNew));
+        _bufferViewName.Push((regionName, viewName, parameters, requestNew));
     }
+
+    public void RequestViewUnload(string regionName, string viewName)
+    {
+        foreach (var handler in _viewHandlers)
+        {
+            handler.OnViewUnload(regionName, viewName);
+        }
+    }
+
     IDisposable IModuleNavigationService<IModule>.BindingNavigationHandler(IModuleNavigationHandler<IModule> moduleHandler)
     {
         _handlers.Add(moduleHandler);
diff --git a/src/Lemon.ModuleNavigation/RegionManager.cs b/src/Lemon.ModuleNavigation/RegionManager.cs
index 965b84a..cff68e3 100644
--- a/src/Lemon.ModuleNavigation/RegionManager.cs
+++ b/src/Lemon.ModuleNavigation/RegionManager.cs
@@ -68,6 +68,29 @@ public void AddRegion(string regionName, IRegion region)
         return region;
     }
 
+    public void RequestUnload(string regionName, string viewName)
+    {
+        if (_regions.TryGetValue(regionName, out var region))
+        {
+             region.DeActivate(viewName);
+        }
+        else
+        {
+            throw new RegionNameNotFoundException(nameof(regionName));
+        }
+    }
+    public void RequestUnload(NavigationContext navigationContext)
+    {
+        if (_regions.TryGetValue(navigationContext.RegionName, out var region))
+        {
+            region.DeActivate(navigationContext);
+        }
+        else
+        {
+            throw new RegionNameNotFoundException(nameof(navigationContext.RegionName));
+        }
+    }
+
     public IDisposable Subscribe(IObserver<NavigationContext> observer)
     {
         if (!_navigationObservers.Add(observer))
@@ -116,4 +139,5 @@ private void ToRegionsObservers(IRegion region)
             });
         }
     }
+
 }

From 4fb1085dde5894b1f85ce17c63fd95fcfcf4b45b Mon Sep 17 00:00:00 2001
From: Easley <nevermore.wd@me.com>
Date: Sat, 29 Mar 2025 17:41:11 +0800
Subject: [PATCH 03/15] add unload

---
 .../Views/MainView.axaml                      | 89 ++++++++++---------
 .../Views/ViewAlpha.axaml                     | 28 +++---
 2 files changed, 63 insertions(+), 54 deletions(-)

diff --git a/src/Lemon.ModuleNavigation.Sample/Views/MainView.axaml b/src/Lemon.ModuleNavigation.Sample/Views/MainView.axaml
index 20b365a..89b405f 100644
--- a/src/Lemon.ModuleNavigation.Sample/Views/MainView.axaml
+++ b/src/Lemon.ModuleNavigation.Sample/Views/MainView.axaml
@@ -1,15 +1,15 @@
 <UserControl
+    d:DesignHeight="550"
+    d:DesignWidth="800"
+    mc:Ignorable="d"
     x:Class="Lemon.ModuleNavigation.Sample.Views.MainView"
+    x:DataType="vm:MainViewModel"
     xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:lm="https://github.com/NeverMorewd/Lemon.ModuleNavigation"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:vm="clr-namespace:Lemon.ModuleNavigation.Sample.ViewModels"
-    d:DesignHeight="550"
-    d:DesignWidth="800"
-    x:DataType="vm:MainViewModel"
-    mc:Ignorable="d">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <UserControl.Styles>
         <Style Selector="StackPanel.ForContainerShow">
             <Setter Property="Spacing" Value="5" />
@@ -42,13 +42,13 @@
             <Setter Property="CommandParameter" Value="{Binding $self.Tag}" />
             <Setter Property="VerticalContentAlignment" Value="Center" />
         </Style>
-		<Style Selector="Button.DialogShowDialogSync">
-			<Setter Property="Height" Value="30" />
-			<Setter Property="Width" Value="300" />
-			<Setter Property="Command" Value="{Binding ShowDialogSyncCommand}" />
-			<Setter Property="CommandParameter" Value="{Binding $self.Tag}" />
-			<Setter Property="VerticalContentAlignment" Value="Center" />
-		</Style>
+        <Style Selector="Button.DialogShowDialogSync">
+            <Setter Property="Height" Value="30" />
+            <Setter Property="Width" Value="300" />
+            <Setter Property="Command" Value="{Binding ShowDialogSyncCommand}" />
+            <Setter Property="CommandParameter" Value="{Binding $self.Tag}" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+        </Style>
     </UserControl.Styles>
     <TabControl>
         <TabItem Header="Module">
@@ -59,9 +59,9 @@
                     Spacing="5">
                     <Label Content="Modules" Target="{Binding ElementName=ModuleLists}" />
                     <ListBox
-                        Name="ModuleLists"
                         Grid.Column="0"
                         ItemsSource="{Binding Modules}"
+                        Name="ModuleLists"
                         SelectedItem="{Binding SelectedModule, Mode=TwoWay}">
                         <ListBox.ItemTemplate>
                             <DataTemplate>
@@ -70,12 +70,12 @@
                         </ListBox.ItemTemplate>
                     </ListBox>
                 </StackPanel>
-                <StackPanel Grid.Column="1" Classes="ForContainerShow">
+                <StackPanel Classes="ForContainerShow" Grid.Column="1">
                     <Label Content="ContentControl" />
                     <Border Classes="HSeparator" />
                     <ContentControl lm:NavigationExtension.ModuleContainerName="NContentControl" />
                 </StackPanel>
-                <StackPanel Grid.Column="2" Classes="ForContainerShow">
+                <StackPanel Classes="ForContainerShow" Grid.Column="2">
                     <Label Content="TabControl" />
                     <Border Classes="HSeparator" />
                     <TabControl lm:NavigationExtension.ModuleContainerName="NTabControl">
@@ -84,29 +84,29 @@
                                 <StackPanel Orientation="Horizontal" Spacing="2">
                                     <TextBlock Text="{Binding Alias}" />
                                     <Button
-                                        Width="20"
+                                        Content="X"
+                                        FontSize="11"
                                         Height="20"
-                                        Padding="-1,0,0,0"
                                         HorizontalContentAlignment="Center"
+                                        Padding="-1,0,0,0"
                                         VerticalContentAlignment="Center"
-                                        lm:NavigationExtension.CanUnload="{Binding CanUnload}"
-                                        Content="X"
-                                        FontSize="11" />
+                                        Width="20"
+                                        lm:NavigationExtension.CanUnload="{Binding CanUnload}" />
                                 </StackPanel>
                             </DataTemplate>
                         </TabControl.ItemTemplate>
                     </TabControl>
                 </StackPanel>
-                <StackPanel Grid.Column="3" Classes="ForContainerShow">
+                <StackPanel Classes="ForContainerShow" Grid.Column="3">
                     <Label Content="ListBox" />
                     <Border Classes="HSeparator" />
                     <ListBox
-                        MaxHeight="600"
-                        Margin="2"
-                        lm:NavigationExtension.ModuleContainerName="NListBox"
                         Background="Transparent"
                         BorderBrush="LemonChiffon"
-                        BorderThickness="1">
+                        BorderThickness="1"
+                        Margin="2"
+                        MaxHeight="600"
+                        lm:NavigationExtension.ModuleContainerName="NListBox">
                         <!--  https://github.com/AvaloniaUI/Avalonia/issues/17349  -->
                         <ListBox.ItemsPanel>
                             <ItemsPanelTemplate>
@@ -115,7 +115,7 @@
                         </ListBox.ItemsPanel>
                     </ListBox>
                 </StackPanel>
-                <StackPanel Grid.Column="4" Classes="ForContainerShow">
+                <StackPanel Classes="ForContainerShow" Grid.Column="4">
                     <Label Content="TransitioningContentControl" />
                     <Border Classes="HSeparator" />
                     <TransitioningContentControl lm:NavigationExtension.ModuleContainerName="NTransitioningContentControl" />
@@ -131,12 +131,12 @@
                     <Button Classes="ViewNavigation" Content="ViewAlpha.RequestNew" />
                     <Button Classes="ViewNavigation" Content="ViewBeta.RequestNew" />
                 </StackPanel>
-                <StackPanel Grid.Column="1" Classes="ForContainerShow">
+                <StackPanel Classes="ForContainerShow" Grid.Column="1">
                     <Label Content="ContentControl" />
                     <Border Classes="HSeparator" />
                     <ContentControl lm:NavigationExtension.RegionName="ContentRegion" />
                 </StackPanel>
-                <StackPanel Grid.Column="2" Classes="ForContainerShow">
+                <StackPanel Classes="ForContainerShow" Grid.Column="2">
                     <Label Content="TabControl" />
                     <Border Classes="HSeparator" />
                     <TabControl lm:NavigationExtension.RegionName="TabRegion">
@@ -144,23 +144,32 @@
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal" Spacing="2">
                                     <TextBlock Text="{Binding}" />
+                                    <Button
+                                        Content="X"
+                                        FontSize="11"
+                                        Height="20"
+                                        HorizontalContentAlignment="Center"
+                                        Padding="-1,0,0,0"
+                                        VerticalContentAlignment="Center"
+                                        Width="20"
+                                        lm:NavigationExtension.CanUnload="True" />
                                 </StackPanel>
                             </DataTemplate>
                         </TabControl.ItemTemplate>
                     </TabControl>
                 </StackPanel>
-                <StackPanel Grid.Column="3" Classes="ForContainerShow">
+                <StackPanel Classes="ForContainerShow" Grid.Column="3">
                     <Label Content="ItemsControl" />
                     <Border Classes="HSeparator" />
                     <ListBox
-                        MaxHeight="600"
-                        Margin="2"
-                        lm:NavigationExtension.RegionName="ItemsRegion"
                         Background="Transparent"
-                        BorderBrush="Blue"
-                        BorderThickness="1" />
+                        BorderBrush="LemonChiffon"
+                        BorderThickness="1"
+                        Margin="2"
+                        MaxHeight="600"
+                        lm:NavigationExtension.RegionName="ItemsRegion" />
                 </StackPanel>
-                <StackPanel Grid.Column="4" Classes="ForContainerShow">
+                <StackPanel Classes="ForContainerShow" Grid.Column="4">
                     <Label Content="TransitioningContentControl" />
                     <Border Classes="HSeparator" />
                     <TransitioningContentControl lm:NavigationExtension.RegionName="TransitioningContentRegion" />
@@ -169,9 +178,9 @@
         </TabItem>
         <TabItem Header="Dialog">
             <StackPanel
-                Width="300"
                 Orientation="Vertical"
-                Spacing="5">
+                Spacing="5"
+                Width="300">
                 <Label Content="Dialogs" />
                 <Button
                     Classes="DialogShow"
@@ -209,9 +218,9 @@
                     <ContentControl Content="11" />
                 </ItemsControl>
                 <!--</ContentControl>-->
-                <ContentControl lm:NavigationExtension.RegionName="LeftRegion" DockPanel.Dock="Left" />
-                <ContentControl lm:NavigationExtension.RegionName="TopRegion" DockPanel.Dock="Top" />
-                <ContentControl lm:NavigationExtension.RegionName="BottomRegion" DockPanel.Dock="Bottom" />
+                <ContentControl DockPanel.Dock="Left" lm:NavigationExtension.RegionName="LeftRegion" />
+                <ContentControl DockPanel.Dock="Top" lm:NavigationExtension.RegionName="TopRegion" />
+                <ContentControl DockPanel.Dock="Bottom" lm:NavigationExtension.RegionName="BottomRegion" />
                 <TransitioningContentControl lm:NavigationExtension.RegionName="MainRegion" />
             </DockPanel>
         </TabItem>
diff --git a/src/Lemon.ModuleNavigation.Sample/Views/ViewAlpha.axaml b/src/Lemon.ModuleNavigation.Sample/Views/ViewAlpha.axaml
index d5bc2d4..c4a766f 100644
--- a/src/Lemon.ModuleNavigation.Sample/Views/ViewAlpha.axaml
+++ b/src/Lemon.ModuleNavigation.Sample/Views/ViewAlpha.axaml
@@ -1,28 +1,28 @@
 <UserControl
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d"
     x:Class="Lemon.ModuleNavigation.Sample.Views.ViewAlpha"
     xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:lm="https://github.com/NeverMorewd/Lemon.ModuleNavigation"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	xmlns:lm="https://github.com/NeverMorewd/Lemon.ModuleNavigation"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Border BorderBrush="LemonChiffon" BorderThickness="2">
         <StackPanel>
             <TextBlock Text="{Binding Greeting}" />
             <Button
-                Width="200"
-                Height="50"
                 Command="{Binding CloseCommand}"
                 Content="CloseDialog"
-                IsVisible="{Binding IsDialog}" />
-			<Button
-			   Width="200"
-			   Height="50"
-			   lm:NavigationExtension.CanUnload="True"
-			   Content="UnloadView"
-			   IsVisible="{Binding !IsDialog}" />
+                Height="50"
+                IsVisible="{Binding IsDialog}"
+                Width="200" />
+            <!--  <Button  -->
+            <!--  Width="200"  -->
+            <!--  Height="50"  -->
+            <!--  lm:NavigationExtension.CanUnload="True"  -->
+            <!--  Content="UnloadView"  -->
+            <!--  IsVisible="{Binding !IsDialog}" />  -->
         </StackPanel>
     </Border>
 </UserControl>

From 666a34456986e957f6ff95286179c47efdcd54ee Mon Sep 17 00:00:00 2001
From: Easley <nevermore.wd@me.com>
Date: Sat, 29 Mar 2025 18:31:24 +0800
Subject: [PATCH 04/15] bak

---
 src/Lemon.ModuleNavigation.Wpf/Region.cs      | 63 ++++++++++---------
 src/Lemon.ModuleNavigation.Wpf/TabRegion.cs   | 42 ++++++++++++-
 .../BaseViewModel.cs                          |  2 +-
 .../MainWindowViewModel.cs                    |  7 ++-
 4 files changed, 77 insertions(+), 37 deletions(-)

diff --git a/src/Lemon.ModuleNavigation.Wpf/Region.cs b/src/Lemon.ModuleNavigation.Wpf/Region.cs
index 9a4ea1b..40381b7 100644
--- a/src/Lemon.ModuleNavigation.Wpf/Region.cs
+++ b/src/Lemon.ModuleNavigation.Wpf/Region.cs
@@ -39,46 +39,49 @@ private DataTemplate CreateRegionDataTemplate()
         return dataTemplate;
     }
 
-    public class NavigationContextToViewConverter : System.Windows.Data.IValueConverter
+    protected virtual IView? ResolveView(NavigationContext context)
     {
-        private readonly Region _region;
-        public NavigationContextToViewConverter(Region region)
+        bool needNewView = !_viewCache.TryGetValue(context.TargetViewName, out IView? view);
+
+        if (!needNewView)
         {
-            _region = region;
+            var navigationAware = view!.DataContext as INavigationAware;
+            if (navigationAware != null && !navigationAware.IsNavigationTarget(context))
+            {
+                needNewView = true; 
+            }
         }
 
-        public object? Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        if (needNewView)
         {
-            if (value is not NavigationContext context)
-                return null;
-
-            bool needNewView = context.RequestNew ||
-                !_region._viewCache.TryGetValue(context.TargetViewName, out IView? view);
+            view = context.ServiceProvider.GetRequiredKeyedService<IView>(context.TargetViewName);
+            var navigationAware = context.ServiceProvider.GetRequiredKeyedService<INavigationAware>(context.TargetViewName);
 
-            if (needNewView)
+            if (_current.TryTakeData(out var previousData))
             {
-                view = context.ServiceProvider.GetRequiredKeyedService<IView>(context.TargetViewName);
-                var navigationAware = context.ServiceProvider.GetRequiredKeyedService<INavigationAware>(context.TargetViewName);
+                previousData.NavigationAware.OnNavigatedFrom(context);
+            }
 
-                if (_region._current.TryTakeData(out var previousData))
-                {
-                    previousData.NavigationAware.OnNavigatedFrom(context);
-                }
+            view.DataContext = navigationAware;
+            navigationAware.OnNavigatedTo(context);
+            _current.SetData((view, navigationAware));
+            _viewCache[context.TargetViewName] = view;
+        }
 
-                if (!navigationAware.IsNavigationTarget(context))
-                    return null;
+        return view;
+    }
 
-                view.DataContext = navigationAware;
-                navigationAware.OnNavigatedTo(context);
-                _region._current.SetData((view, navigationAware));
-                _region._viewCache.TryAdd(context.TargetViewName, view);
-            }
-            else
-            {
-                view = _region._viewCache[context.TargetViewName];
-            }
+    private class NavigationContextToViewConverter : System.Windows.Data.IValueConverter
+    {
+        private readonly Region _region;
+        public NavigationContextToViewConverter(Region region)
+        {
+            _region = region;
+        }
 
-            return view as Control;
+        public object? Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            return value is NavigationContext context ? _region.ResolveView(context) as Control : null;
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
@@ -87,5 +90,3 @@ public object ConvertBack(object value, Type targetType, object parameter, Syste
         }
     }
 }
-
-
diff --git a/src/Lemon.ModuleNavigation.Wpf/TabRegion.cs b/src/Lemon.ModuleNavigation.Wpf/TabRegion.cs
index 28e047b..aae7a18 100644
--- a/src/Lemon.ModuleNavigation.Wpf/TabRegion.cs
+++ b/src/Lemon.ModuleNavigation.Wpf/TabRegion.cs
@@ -1,13 +1,18 @@
-using System.Collections.ObjectModel;
+using Lemon.ModuleNavigation.Abstractions;
+using Lemon.ModuleNavigation.Core;
+using Microsoft.Extensions.DependencyInjection;
+using System.Collections.Concurrent;
+using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Windows.Controls;
-using System.Windows.Data;
 
 namespace Lemon.ModuleNavigation.Wpf;
 
 public class TabRegion : Region
 {
     private readonly TabControl _tabControl;
+    private readonly ConcurrentDictionary<Guid, IView> _viewCache = new();
+    private readonly ConcurrentItem<(IView View, INavigationAware NavigationAware)> _current = new();
     public TabRegion(TabControl tabControl, string name)
     {
 
@@ -101,4 +106,37 @@ private void ViewContents_CollectionChanged(object? sender, NotifyCollectionChan
             }
         }
     }
+
+
+    protected override IView? ResolveView(NavigationContext context)
+    {
+        bool needNewView = !_viewCache.TryGetValue(context.Guid, out IView? view);
+
+        if (!needNewView)
+        {
+            var navigationAware = view!.DataContext as INavigationAware;
+            if (navigationAware != null && !navigationAware.IsNavigationTarget(context))
+            {
+                needNewView = true;
+            }
+        }
+
+        if (needNewView)
+        {
+            view = context.ServiceProvider.GetRequiredKeyedService<IView>(context.TargetViewName);
+            var navigationAware = context.ServiceProvider.GetRequiredKeyedService<INavigationAware>(context.TargetViewName);
+
+            if (_current.TryTakeData(out var previousData))
+            {
+                previousData.NavigationAware.OnNavigatedFrom(context);
+            }
+
+            view.DataContext = navigationAware;
+            navigationAware.OnNavigatedTo(context);
+            _current.SetData((view, navigationAware));
+            _viewCache[context.Guid] = view;
+        }
+
+        return view;
+    }
 }
diff --git a/src/Lemon.ModuleNavigation.WpfSample/BaseViewModel.cs b/src/Lemon.ModuleNavigation.WpfSample/BaseViewModel.cs
index f1c7783..7f39959 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/BaseViewModel.cs
+++ b/src/Lemon.ModuleNavigation.WpfSample/BaseViewModel.cs
@@ -7,7 +7,7 @@ namespace Lemon.ModuleNavigation.WpfSample;
 public class BaseViewModel : ReactiveObject, INavigationAware
 {
     public virtual string Greeting => $"Welcome to {GetType().Name}[{Environment.ProcessId}][{Environment.CurrentManagedThreadId}]{Environment.NewLine}{DateTime.Now:yyyy-MM-dd HH-mm-ss.ffff}";
-    public bool IsNavigationTarget(NavigationContext navigationContext)
+    public virtual bool IsNavigationTarget(NavigationContext navigationContext)
     {
         return true;
     }
diff --git a/src/Lemon.ModuleNavigation.WpfSample/MainWindowViewModel.cs b/src/Lemon.ModuleNavigation.WpfSample/MainWindowViewModel.cs
index 55d54da..3859d29 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/MainWindowViewModel.cs
+++ b/src/Lemon.ModuleNavigation.WpfSample/MainWindowViewModel.cs
@@ -1,4 +1,5 @@
 using Lemon.ModuleNavigation.Abstractions;
+using Lemon.ModuleNavigation.Core;
 using Lemon.ModuleNavigation.Dialogs;
 using ReactiveUI;
 using Splat;
@@ -29,9 +30,9 @@ public MainWindowViewModel(INavigationService navigationService,
                 requestNew = true;
 
             }
-            _navigationService.RequestViewNavigation("ContentRegion", viewName, requestNew);
-            _navigationService.RequestViewNavigation("TabRegion", viewName, requestNew);
-            _navigationService.RequestViewNavigation("ItemsRegion", viewName, requestNew);
+            _navigationService.RequestViewNavigation("ContentRegion", viewName, new NavigationParameters { { "requestNew", requestNew } }, requestNew);
+            _navigationService.RequestViewNavigation("TabRegion", viewName, new NavigationParameters { { "requestNew", requestNew } }, requestNew);
+            _navigationService.RequestViewNavigation("ItemsRegion", viewName, new NavigationParameters { { "requestNew", requestNew } }, requestNew);
         });
 
         ShowCommand = ReactiveCommand.Create<string>(content =>

From 826304de1a5f84bdd1c20940c912b642a2879071 Mon Sep 17 00:00:00 2001
From: Easley <nevermore.wd@me.com>
Date: Mon, 31 Mar 2025 15:10:43 +0800
Subject: [PATCH 05/15] region optimization

---
 .../ContentRegion.cs                          |   6 +
 .../ContentRegion.cs                          | 145 +++++++++++-------
 .../Extensions/WpfExtensions.cs               |  36 +++++
 src/Lemon.ModuleNavigation.Wpf/ItemsRegion.cs |  47 +++++-
 src/Lemon.ModuleNavigation.Wpf/Region.cs      |  75 +++++++--
 src/Lemon.ModuleNavigation.Wpf/TabRegion.cs   |  33 ++--
 .../{ViewInfo.cs => ViewDiscription.cs}       |   0
 src/Lemon.ModuleNavigation/ViewId.cs          |  24 +++
 8 files changed, 283 insertions(+), 83 deletions(-)
 rename src/Lemon.ModuleNavigation/{ViewInfo.cs => ViewDiscription.cs} (100%)
 create mode 100644 src/Lemon.ModuleNavigation/ViewId.cs

diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/ContentRegion.cs b/src/Lemon.ModuleNavigation.Avaloniaui/ContentRegion.cs
index 5b9e49b..ca988f1 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/ContentRegion.cs
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/ContentRegion.cs
@@ -1,4 +1,8 @@
 using Avalonia.Controls;
+using Lemon.ModuleNavigation.Abstractions;
+using Lemon.ModuleNavigation.Core;
+using Microsoft.Extensions.DependencyInjection;
+using System.Collections.Concurrent;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 
@@ -6,6 +10,8 @@ namespace Lemon.ModuleNavigation.Avaloniaui;
 
 public class ContentRegion : Region
 {
+    private readonly ConcurrentDictionary<string, IView> _viewCache = new();
+    private readonly ConcurrentItem<(IView View, INavigationAware NavigationAware)> _current = new();
     private readonly ContentControl _contentControl;
     public ContentRegion(ContentControl contentControl, string name) : base()
     {
diff --git a/src/Lemon.ModuleNavigation.Wpf/ContentRegion.cs b/src/Lemon.ModuleNavigation.Wpf/ContentRegion.cs
index 5bf8f07..df78585 100644
--- a/src/Lemon.ModuleNavigation.Wpf/ContentRegion.cs
+++ b/src/Lemon.ModuleNavigation.Wpf/ContentRegion.cs
@@ -1,84 +1,123 @@
-using System.Collections.ObjectModel;
+using Lemon.ModuleNavigation.Abstractions;
+using Lemon.ModuleNavigation.Core;
+using Microsoft.Extensions.DependencyInjection;
+using System.Collections.Concurrent;
+using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Windows.Controls;
 
-namespace Lemon.ModuleNavigation.Wpf
+namespace Lemon.ModuleNavigation.Wpf;
+
+public class ContentRegion : Region
 {
-    public class ContentRegion : Region
+    private readonly ConcurrentDictionary<string, IView> _viewNameCache = new();
+    private readonly ConcurrentItem<(IView View, INavigationAware NavigationAware)> _current = new();
+    private readonly ContentControl _contentControl;
+    public ContentRegion(ContentControl contentControl, string name) : base()
     {
-        private readonly ContentControl _contentControl;
-        public ContentRegion(ContentControl contentControl, string name) : base()
+        _contentControl = contentControl;
+        _contentControl.ContentTemplate = RegionTemplate;
+        Contexts = [];
+        Contexts.CollectionChanged += ViewContents_CollectionChanged;
+        Name = name;
+    }
+
+    public override string Name
+    {
+        get;
+    }
+    public object? Content 
+    { 
+        get => _contentControl.Content;
+        set
         {
-            _contentControl = contentControl;
-            _contentControl.ContentTemplate = RegionTemplate;
-            Contexts = [];
-            Contexts.CollectionChanged += ViewContents_CollectionChanged;
-            Name = name;
+            _contentControl.Content = value;
         }
+    }
+    public override ObservableCollection<NavigationContext> Contexts
+    {
+        get;
+    }
 
-        public override string Name
+    public override void Activate(NavigationContext target)
+    {
+        if(Content is NavigationContext current)
         {
-            get;
-        }
-        public object? Content 
-        { 
-            get => _contentControl.Content;
-            set
+            if (target.TargetViewName == current.TargetViewName 
+                && !target.RequestNew)
             {
-                _contentControl.Content = value;
+                return;
             }
         }
-        public override ObservableCollection<NavigationContext> Contexts
-        {
-            get;
-        }
+        Content = target;
+        Contexts.Add(target);
+    }
 
-        public override void Activate(NavigationContext target)
+    public override void DeActivate(string regionName)
+    {
+        if (Content is NavigationContext current)
         {
-            if(Content is NavigationContext current)
+            if (current.TargetViewName == regionName)
             {
-                if (target.TargetViewName == current.TargetViewName 
-                    && !target.RequestNew)
-                {
-                    return;
-                }
+                Contexts.Remove(current);
+                Content = null;
             }
-            Content = target;
-            Contexts.Add(target);
         }
-
-        public override void DeActivate(string regionName)
+    }
+    public override void DeActivate(NavigationContext navigationContext)
+    {
+        if (Content is NavigationContext current)
         {
-            if (Content is NavigationContext current)
+            if (current == navigationContext)
             {
-                if (current.TargetViewName == regionName)
-                {
-                    Contexts.Remove(current);
-                    Content = null;
-                }
+                Contexts.Remove(current);
+                Content = null;
             }
         }
-        public override void DeActivate(NavigationContext navigationContext)
+    }
+    private void ViewContents_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+    {
+        if (e.Action == NotifyCollectionChangedAction.Add)
         {
-            if (Content is NavigationContext current)
-            {
-                if (current == navigationContext)
-                {
-                    Contexts.Remove(current);
-                    Content = null;
-                }
-            }
+            //
         }
-        private void ViewContents_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+        if (e.Action == NotifyCollectionChangedAction.Remove)
         {
-            if (e.Action == NotifyCollectionChangedAction.Add)
+            //
+        }
+    }
+
+    protected override IView? ResolveView(NavigationContext context)
+    {
+        bool needNewView = !_viewNameCache.TryGetValue(context.TargetViewName, out IView? view) 
+            || context.RequestNew;
+
+        if (!needNewView)
+        {
+            if (view!.DataContext is INavigationAware navigationAware 
+                && !navigationAware.IsNavigationTarget(context))
             {
-                //
+                needNewView = true;
             }
-            if (e.Action == NotifyCollectionChangedAction.Remove)
+        }
+
+        if (needNewView)
+        {
+            view = context.ServiceProvider.GetRequiredKeyedService<IView>(context.TargetViewName);
+            var navigationAware = context.ServiceProvider.GetRequiredKeyedService<INavigationAware>(context.TargetViewName);
+
+            if (_current.TryTakeData(out var previousData))
             {
-                //
+                previousData.NavigationAware.OnNavigatedFrom(context);
             }
+
+            view.DataContext = navigationAware;
+            navigationAware.OnNavigatedTo(context);
+            _current.SetData((view, navigationAware));
+            _viewNameCache[context.TargetViewName] = view;
         }
+
+        return view;
     }
+
 }
diff --git a/src/Lemon.ModuleNavigation.Wpf/Extensions/WpfExtensions.cs b/src/Lemon.ModuleNavigation.Wpf/Extensions/WpfExtensions.cs
index 1037162..4e457ca 100644
--- a/src/Lemon.ModuleNavigation.Wpf/Extensions/WpfExtensions.cs
+++ b/src/Lemon.ModuleNavigation.Wpf/Extensions/WpfExtensions.cs
@@ -48,5 +48,41 @@ public static IRegion ToContainer(this Control control, string name)
                 _ => throw new NotSupportedException($"Unsupported control:{control.GetType()}"),
             };
         }
+
+        public static void ScrollIntoView(this ItemsControl itemsControl, object item)
+        {
+            if (itemsControl == null || item == null)
+                return;
+            if (itemsControl is ListBox listBox)
+            {
+                listBox.Dispatcher.InvokeAsync(() => listBox.ScrollIntoView(item));
+            }
+            else
+            {
+                var container = itemsControl.ItemContainerGenerator.ContainerFromItem(item) as FrameworkElement;
+                if (container != null)
+                {
+                    container.BringIntoView();
+                    return;
+                }
+                itemsControl.ItemContainerGenerator.StatusChanged += (s, e) =>
+                {
+                    if (itemsControl.ItemContainerGenerator.Status == System.Windows.Controls.Primitives.GeneratorStatus.ContainersGenerated)
+                    {
+                        container = itemsControl.ItemContainerGenerator.ContainerFromItem(item) as FrameworkElement;
+                        container?.BringIntoView();
+                    }
+                };
+            }
+        }
+
+        public static void ScrollIntoView(this ItemsControl itemsControl, int index)
+        {
+            if (itemsControl == null || index < 0 || index >= itemsControl.Items.Count)
+                return;
+
+            var item = itemsControl.Items[index];
+            itemsControl.ScrollIntoView(item);
+        }
     }
 }
diff --git a/src/Lemon.ModuleNavigation.Wpf/ItemsRegion.cs b/src/Lemon.ModuleNavigation.Wpf/ItemsRegion.cs
index 86cb830..a23b7f4 100644
--- a/src/Lemon.ModuleNavigation.Wpf/ItemsRegion.cs
+++ b/src/Lemon.ModuleNavigation.Wpf/ItemsRegion.cs
@@ -1,5 +1,9 @@
-using System.Collections.ObjectModel;
+using Lemon.ModuleNavigation.Abstractions;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.ObjectModel;
 using System.Collections.Specialized;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 
@@ -47,13 +51,13 @@ public override ObservableCollection<NavigationContext> Contexts
         get;
     }
 
-    public void ScrollIntoView(int index)
+    public override void ScrollIntoView(int index)
     {
-        throw new NotImplementedException();
+        _itemsControl.ScrollIntoView(index);
     }
-    public void ScrollIntoView(NavigationContext item)
+    public override void ScrollIntoView(NavigationContext item)
     {
-        throw new NotImplementedException();
+        _itemsControl.ScrollIntoView(item);
     }
     public override void Activate(NavigationContext target)
     {
@@ -82,6 +86,7 @@ public override void Activate(NavigationContext target)
             Contexts.Add(target);
             SelectedItem = target;
         }
+        ScrollIntoView((SelectedItem as NavigationContext)!);
     }
     public override void DeActivate(string viewName)
     {
@@ -118,4 +123,36 @@ private void ViewContents_CollectionChanged(object? sender, NotifyCollectionChan
             }
         }
     }
+
+    protected override IView? ResolveView(NavigationContext context)
+    {
+        bool needNewView = !ViewCache.TryGetValue(context.Guid, out IView? view);
+
+        if (!needNewView)
+        {
+            if (view!.DataContext is INavigationAware navigationAware 
+                && !navigationAware.IsNavigationTarget(context))
+            {
+                needNewView = true;
+            }
+        }
+
+        if (needNewView)
+        {
+            view = context.ServiceProvider.GetRequiredKeyedService<IView>(context.TargetViewName);
+            var navigationAware = context.ServiceProvider.GetRequiredKeyedService<INavigationAware>(context.TargetViewName);
+
+            if (Current.TryTakeData(out var previousData))
+            {
+                previousData.NavigationAware.OnNavigatedFrom(context);
+            }
+
+            view.DataContext = navigationAware;
+            navigationAware.OnNavigatedTo(context);
+            Current.SetData((view, navigationAware));
+            ViewCache[context.Guid] = view;
+        }
+
+        return view;
+    }
 }
diff --git a/src/Lemon.ModuleNavigation.Wpf/Region.cs b/src/Lemon.ModuleNavigation.Wpf/Region.cs
index 40381b7..85ad1b5 100644
--- a/src/Lemon.ModuleNavigation.Wpf/Region.cs
+++ b/src/Lemon.ModuleNavigation.Wpf/Region.cs
@@ -3,26 +3,65 @@
 using Microsoft.Extensions.DependencyInjection;
 using System.Collections.Concurrent;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Controls;
 
 namespace Lemon.ModuleNavigation.Wpf;
 
-public abstract class Region : IRegion
+public abstract class Region : IRegion, INotifyPropertyChanged
 {
-    private readonly ConcurrentDictionary<string, IView> _viewCache = new();
-    private readonly ConcurrentItem<(IView View, INavigationAware NavigationAware)> _current = new();
-
     public Region()
     {
+        Current = new();
+        ViewCache = [];
+        ViewNameCache = [];
         RegionTemplate = CreateRegionDataTemplate();
     }
 
-    public abstract string Name { get; }
-    public abstract ObservableCollection<NavigationContext> Contexts { get; }
+    protected ConcurrentDictionary<Guid, IView> ViewCache
+    {
+        get;
+    }
+    protected ConcurrentDictionary<string, IView> ViewNameCache
+    {
+        get;
+    }
+    protected ConcurrentItem<(IView View, INavigationAware NavigationAware)> Current
+    {
+        get;
+    }
+    public abstract string Name
+    {
+        get;
+    }
 
-    public DataTemplate? RegionTemplate { get; set; }
+    public abstract ObservableCollection<NavigationContext> Contexts
+    {
+        get;
+    }
 
+    public DataTemplate? RegionTemplate
+    {
+        get;
+        private set;
+    }
+
+    public event PropertyChangedEventHandler? PropertyChanged;
+    protected void OnPropertyChanged([CallerMemberName] string? propertyName = null)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
+
+    public virtual void ScrollIntoView(int index)
+    {
+        throw new NotImplementedException();
+    }
+    public virtual void ScrollIntoView(NavigationContext item)
+    {
+        throw new NotImplementedException();
+    }
     public abstract void Activate(NavigationContext target);
     public abstract void DeActivate(string viewName);
     public abstract void DeActivate(NavigationContext target);
@@ -41,14 +80,14 @@ private DataTemplate CreateRegionDataTemplate()
 
     protected virtual IView? ResolveView(NavigationContext context)
     {
-        bool needNewView = !_viewCache.TryGetValue(context.TargetViewName, out IView? view);
+        bool needNewView = !ViewNameCache.TryGetValue(context.TargetViewName, out IView? view);
 
         if (!needNewView)
         {
-            var navigationAware = view!.DataContext as INavigationAware;
-            if (navigationAware != null && !navigationAware.IsNavigationTarget(context))
+            if (view!.DataContext is INavigationAware navigationAware
+                && !navigationAware.IsNavigationTarget(context))
             {
-                needNewView = true; 
+                needNewView = true;
             }
         }
 
@@ -57,15 +96,15 @@ private DataTemplate CreateRegionDataTemplate()
             view = context.ServiceProvider.GetRequiredKeyedService<IView>(context.TargetViewName);
             var navigationAware = context.ServiceProvider.GetRequiredKeyedService<INavigationAware>(context.TargetViewName);
 
-            if (_current.TryTakeData(out var previousData))
+            if (Current.TryTakeData(out var previousData))
             {
                 previousData.NavigationAware.OnNavigatedFrom(context);
             }
 
             view.DataContext = navigationAware;
             navigationAware.OnNavigatedTo(context);
-            _current.SetData((view, navigationAware));
-            _viewCache[context.TargetViewName] = view;
+            Current.SetData((view, navigationAware));
+            ViewNameCache[context.TargetViewName] = view;
         }
 
         return view;
@@ -81,7 +120,13 @@ public NavigationContextToViewConverter(Region region)
 
         public object? Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
-            return value is NavigationContext context ? _region.ResolveView(context) as Control : null;
+            if (value is NavigationContext context)
+            {
+                var view = _region.ResolveView(context);
+                _region.ViewCache.AddOrUpdate(context.Guid, view!, (key, oldValue) => view!);
+                return view;
+            }
+            return null;
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
diff --git a/src/Lemon.ModuleNavigation.Wpf/TabRegion.cs b/src/Lemon.ModuleNavigation.Wpf/TabRegion.cs
index aae7a18..026e2ef 100644
--- a/src/Lemon.ModuleNavigation.Wpf/TabRegion.cs
+++ b/src/Lemon.ModuleNavigation.Wpf/TabRegion.cs
@@ -4,38 +4,51 @@
 using System.Collections.Concurrent;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
+using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
 
 namespace Lemon.ModuleNavigation.Wpf;
 
 public class TabRegion : Region
 {
     private readonly TabControl _tabControl;
-    private readonly ConcurrentDictionary<Guid, IView> _viewCache = new();
-    private readonly ConcurrentItem<(IView View, INavigationAware NavigationAware)> _current = new();
     public TabRegion(TabControl tabControl, string name)
     {
-
-
         _tabControl = tabControl;
         _tabControl.ContentTemplate = RegionTemplate;
         Contexts = [];
         Contexts.CollectionChanged += ViewContents_CollectionChanged;
         Name = name;
+        BindingOperations.SetBinding(_tabControl, Selector.SelectedItemProperty, new Binding
+        {
+            Source = this,
+            Path = new PropertyPath(nameof(SelectedItem)),
+            Mode = BindingMode.TwoWay
+        });
+        BindingOperations.SetBinding(_tabControl, ItemsControl.ItemsSourceProperty, new Binding
+        {
+            Source = this,
+            Path = new PropertyPath(nameof(SelectedItem)),
+            Mode = BindingMode.TwoWay
+        });
     }
     public override string Name
     {
         get;
     }
+    private object? _selectItem;
     public object? SelectedItem
     {
         get
         {
-            return _tabControl.SelectedItem;
+            return _selectItem;
         }
         set
         {
-            _tabControl.SelectedItem = value;
+            _selectItem = value;
+            OnPropertyChanged();
         }
     }
     public override ObservableCollection<NavigationContext> Contexts
@@ -110,7 +123,7 @@ private void ViewContents_CollectionChanged(object? sender, NotifyCollectionChan
 
     protected override IView? ResolveView(NavigationContext context)
     {
-        bool needNewView = !_viewCache.TryGetValue(context.Guid, out IView? view);
+        bool needNewView = !ViewCache.TryGetValue(context.Guid, out IView? view);
 
         if (!needNewView)
         {
@@ -126,15 +139,15 @@ private void ViewContents_CollectionChanged(object? sender, NotifyCollectionChan
             view = context.ServiceProvider.GetRequiredKeyedService<IView>(context.TargetViewName);
             var navigationAware = context.ServiceProvider.GetRequiredKeyedService<INavigationAware>(context.TargetViewName);
 
-            if (_current.TryTakeData(out var previousData))
+            if (Current.TryTakeData(out var previousData))
             {
                 previousData.NavigationAware.OnNavigatedFrom(context);
             }
 
             view.DataContext = navigationAware;
             navigationAware.OnNavigatedTo(context);
-            _current.SetData((view, navigationAware));
-            _viewCache[context.Guid] = view;
+            Current.SetData((view, navigationAware));
+            ViewCache[context.Guid] = view;
         }
 
         return view;
diff --git a/src/Lemon.ModuleNavigation/ViewInfo.cs b/src/Lemon.ModuleNavigation/ViewDiscription.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation/ViewInfo.cs
rename to src/Lemon.ModuleNavigation/ViewDiscription.cs
diff --git a/src/Lemon.ModuleNavigation/ViewId.cs b/src/Lemon.ModuleNavigation/ViewId.cs
new file mode 100644
index 0000000..8c1a73c
--- /dev/null
+++ b/src/Lemon.ModuleNavigation/ViewId.cs
@@ -0,0 +1,24 @@
+using Lemon.ModuleNavigation.Abstractions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Lemon.ModuleNavigation;
+
+public struct ViewId
+{
+    //public ViewId(Guid navigationGuid, IView view)
+    //{
+    //    Guid = view.gu;
+    //}
+    //public Guid Guid
+    //{
+    //    get;
+    //}
+    //public static ViewId GetId(IView view)
+    //{
+        
+    //}
+}

From a54605702c726ff015a57d4e698ddaf6115f14e3 Mon Sep 17 00:00:00 2001
From: Easley <nevermore.wd@me.com>
Date: Tue, 1 Apr 2025 18:31:33 +0800
Subject: [PATCH 06/15] wpf unload done

---
 .../ContentRegion.cs                          |   4 +-
 .../ItemsRegion.cs                            |   2 +-
 .../Region.cs                                 |  10 +-
 .../TabRegion.cs                              |   2 +-
 .../ViewModels/MainViewModel.cs               |   2 +-
 .../ViewModels/ViewAlphaViewModel.cs          |   1 -
 .../ViewModels/ViewBetaViewModel.cs           |  92 +++++------
 .../AssemblyInfo.cs                           |   1 +
 .../ContentRegion.cs                          | 123 --------------
 .../DialogService.cs                          |   2 +-
 .../Extensions/WpfExtensions.cs               | 119 +++++++-------
 .../NavigationExtension.cs                    |  86 +---------
 .../Regions/ContentRegion.cs                  | 135 +++++++++++++++
 .../{ => Regions}/ItemsRegion.cs              | 119 +++++++-------
 .../{ => Regions}/Region.cs                   |  79 ++++-----
 .../Regions/TabRegion.cs                      |  48 ++++++
 src/Lemon.ModuleNavigation.Wpf/TabRegion.cs   | 155 ------------------
 .../App.xaml.cs                               |   4 -
 ...iewModel.cs => BaseNavigationViewModel.cs} |  24 ++-
 .../BoolToVisibilityConverter.cs              |  34 ++++
 .../MainWindow.xaml                           |   8 +-
 .../MainWindow.xaml.cs                        |  11 +-
 .../MainWindowViewModel.cs                    |  18 +-
 .../ViewModels/ViewAlphaViewModel.cs          |   9 +-
 .../ViewModels/ViewBetaViewModel.cs           |   8 +-
 .../Views/ViewAlpha.xaml                      |  42 +++--
 .../Views/ViewBeta.xaml                       |  42 +++--
 .../IContentRegionContext{TDataTemplate}.cs   |  10 ++
 .../IContentRegion{TDataTemplate}.cs          |  17 --
 .../Abstractions/IDialogResult.cs             |  25 ++-
 .../IItemsRegionDataContext{TDataTemplate}.cs |  17 ++
 .../IItemsRegion{TDataTemplate}.cs            |  20 ---
 .../Abstractions/IModuleNavigationHandler.cs  |   9 +-
 .../IModuleNavigationHandler{T}.cs            |   9 +-
 .../Abstractions/IModuleNavigationService.cs  |  11 +-
 .../IModuleNavigationService{T}.cs            |  11 +-
 .../Abstractions/IModuleScope.cs              |  11 +-
 .../Abstractions/IModuleServiceProvider.cs    |   7 +-
 .../Abstractions/INavigationAware.cs          |  14 +-
 .../Abstractions/INavigationHandler.cs        |  11 +-
 .../Abstractions/INavigationService.cs        |   7 +-
 .../Abstractions/IRegion.cs                   |  28 ++--
 .../Abstractions/IRegionManager.cs            |  20 +--
 .../Abstractions/IServiceAware.cs             |   9 +-
 .../Abstractions/ITabRegion{TDataTemplate}.cs |  18 --
 .../Abstractions/IViewNavigationService.cs    |  28 ++++
 .../Core/ButtonResult.cs                      |   2 +-
 .../Core/DialogParameters.cs                  |   9 +-
 .../Core/DialogResult.cs                      |   2 +-
 .../NavigationContext.cs                      |  10 +-
 50 files changed, 683 insertions(+), 802 deletions(-)
 delete mode 100644 src/Lemon.ModuleNavigation.Wpf/ContentRegion.cs
 create mode 100644 src/Lemon.ModuleNavigation.Wpf/Regions/ContentRegion.cs
 rename src/Lemon.ModuleNavigation.Wpf/{ => Regions}/ItemsRegion.cs (56%)
 rename src/Lemon.ModuleNavigation.Wpf/{ => Regions}/Region.cs (62%)
 create mode 100644 src/Lemon.ModuleNavigation.Wpf/Regions/TabRegion.cs
 delete mode 100644 src/Lemon.ModuleNavigation.Wpf/TabRegion.cs
 rename src/Lemon.ModuleNavigation.WpfSample/{BaseViewModel.cs => BaseNavigationViewModel.cs} (54%)
 create mode 100644 src/Lemon.ModuleNavigation.WpfSample/BoolToVisibilityConverter.cs
 create mode 100644 src/Lemon.ModuleNavigation/Abstractions/IContentRegionContext{TDataTemplate}.cs
 delete mode 100644 src/Lemon.ModuleNavigation/Abstractions/IContentRegion{TDataTemplate}.cs
 create mode 100644 src/Lemon.ModuleNavigation/Abstractions/IItemsRegionDataContext{TDataTemplate}.cs
 delete mode 100644 src/Lemon.ModuleNavigation/Abstractions/IItemsRegion{TDataTemplate}.cs
 delete mode 100644 src/Lemon.ModuleNavigation/Abstractions/ITabRegion{TDataTemplate}.cs

diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/ContentRegion.cs b/src/Lemon.ModuleNavigation.Avaloniaui/ContentRegion.cs
index ca988f1..23c3999 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/ContentRegion.cs
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/ContentRegion.cs
@@ -43,7 +43,7 @@ public override void Activate(NavigationContext target)
     {
         if(Content is NavigationContext current)
         {
-            if (target.TargetViewName == current.TargetViewName 
+            if (target.ViewName == current.ViewName 
                 && !target.RequestNew)
             {
                 return;
@@ -57,7 +57,7 @@ public override void DeActivate(string regionName)
     {
         if (Content is NavigationContext current)
         {
-            if (current.TargetViewName == regionName)
+            if (current.ViewName == regionName)
             {
                 Contexts.Remove(current);
                 Content = null;
diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/ItemsRegion.cs b/src/Lemon.ModuleNavigation.Avaloniaui/ItemsRegion.cs
index 968961e..3e06cb3 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/ItemsRegion.cs
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/ItemsRegion.cs
@@ -86,7 +86,7 @@ public override void Activate(NavigationContext target)
     }
     public override void DeActivate(string viewName)
     {
-        Contexts.Remove(Contexts.Last(c => c.TargetViewName == viewName));
+        Contexts.Remove(Contexts.Last(c => c.ViewName == viewName));
     }
     public override void DeActivate(NavigationContext navigationContext)
     {
diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/Region.cs b/src/Lemon.ModuleNavigation.Avaloniaui/Region.cs
index 942cc98..62167c6 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/Region.cs
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/Region.cs
@@ -35,12 +35,12 @@ private IDataTemplate CreateRegionDataTemplate()
                 return null;
 
             bool needNewView = context.RequestNew ||
-                !_viewCache.TryGetValue(context.TargetViewName, out IView? view);
+                !_viewCache.TryGetValue(context.ViewName, out IView? view);
 
             if (needNewView)
             {
-                view = context.ServiceProvider.GetRequiredKeyedService<IView>(context.TargetViewName);
-                var navigationAware = context.ServiceProvider.GetRequiredKeyedService<INavigationAware>(context.TargetViewName);
+                view = context.ServiceProvider.GetRequiredKeyedService<IView>(context.ViewName);
+                var navigationAware = context.ServiceProvider.GetRequiredKeyedService<INavigationAware>(context.ViewName);
 
                 if (_current.TryTakeData(out var previousData))
                 {
@@ -52,11 +52,11 @@ private IDataTemplate CreateRegionDataTemplate()
                 view.DataContext = navigationAware;
                 navigationAware.OnNavigatedTo(context);
                 _current.SetData((view, navigationAware));
-                _viewCache.TryAdd(context.TargetViewName, view);
+                _viewCache.TryAdd(context.ViewName, view);
             }
             else
             {
-                view = _viewCache[context.TargetViewName];
+                view = _viewCache[context.ViewName];
             }
 
             return view as Control;
diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/TabRegion.cs b/src/Lemon.ModuleNavigation.Avaloniaui/TabRegion.cs
index e6c39d3..ec4bfa3 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/TabRegion.cs
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/TabRegion.cs
@@ -89,7 +89,7 @@ public override void Activate(NavigationContext target)
     }
     public override void DeActivate(string viewName)
     {
-        Contexts.Remove(Contexts.Last(c => c.TargetViewName == viewName));
+        Contexts.Remove(Contexts.Last(c => c.ViewName == viewName));
     }
     public override void DeActivate(NavigationContext navigationContext)
     {
diff --git a/src/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs b/src/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
index 7f50b2a..da0c666 100644
--- a/src/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
+++ b/src/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
@@ -96,7 +96,7 @@ await _dialogService.ShowDialog(content,
 
         _regionManager.NavigationSubscribe<NavigationContext>(n => 
         {
-            _logger.LogDebug($"Request to : {n.RegionName}.{n.TargetViewName}");
+            _logger.LogDebug($"Request to : {n.RegionName}.{n.ViewName}");
         });
         _regionManager.NavigationSubscribe<IRegion>(r => 
         {
diff --git a/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewAlphaViewModel.cs b/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewAlphaViewModel.cs
index a9e0370..655941e 100644
--- a/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewAlphaViewModel.cs
+++ b/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewAlphaViewModel.cs
@@ -1,6 +1,5 @@
 using Lemon.ModuleNavigation.Abstractions;
 using Lemon.ModuleNavigation.Core;
-using Lemon.ModuleNavigation.Dialogs;
 using Microsoft.Extensions.Logging;
 using ReactiveUI;
 using System;
diff --git a/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewBetaViewModel.cs b/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewBetaViewModel.cs
index f03ffe3..f88035a 100644
--- a/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewBetaViewModel.cs
+++ b/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewBetaViewModel.cs
@@ -1,67 +1,65 @@
 using Lemon.ModuleNavigation.Abstractions;
 using Lemon.ModuleNavigation.Core;
-using Lemon.ModuleNavigation.Dialogs;
 using Microsoft.Extensions.Logging;
 using ReactiveUI;
 using System;
 using System.Reactive;
 
-namespace Lemon.ModuleNavigation.Sample.ViewModels
+namespace Lemon.ModuleNavigation.Sample.ViewModels;
+
+public class ViewBetaViewModel : SampleViewModelBase,
+    IDialogAware,
+    INavigationAware
 {
-    public class ViewBetaViewModel: SampleViewModelBase, 
-        IDialogAware, 
-        INavigationAware
+    private readonly ILogger _logger;
+    public ViewBetaViewModel(ILogger<ViewBetaViewModel> logger)
     {
-        private readonly ILogger _logger;
-        public ViewBetaViewModel(ILogger<ViewBetaViewModel> logger)
+        _logger = logger;
+        CloseCommand = ReactiveCommand.Create(() =>
         {
-            _logger = logger;
-            CloseCommand = ReactiveCommand.Create(() =>
+            var param = new DialogParameters
             {
-                var param = new DialogParameters
-                {
-                    { "from", nameof(ViewAlphaViewModel) }
-                };
-                RequestClose?.Invoke(new DialogResult(ButtonResult.OK, param));
-            });
-        }
-        private bool _isDialog = false;
-        public bool IsDialog
+                { "from", nameof(ViewAlphaViewModel) }
+            };
+            RequestClose?.Invoke(new DialogResult(ButtonResult.OK, param));
+        });
+    }
+    private bool _isDialog = false;
+    public bool IsDialog
+    {
+        get => _isDialog;
+        set
         {
-            get => _isDialog;
-            set
-            {
-                this.RaiseAndSetIfChanged(ref _isDialog, value);
-            }
+            this.RaiseAndSetIfChanged(ref _isDialog, value);
         }
-        public ReactiveCommand<Unit, Unit> CloseCommand { get; }
-        public string Title => nameof(ViewAlphaViewModel);
-        public event Action<IDialogResult>? RequestClose;
+    }
+    public ReactiveCommand<Unit, Unit> CloseCommand { get; }
+    public string Title => nameof(ViewAlphaViewModel);
+    public event Action<IDialogResult>? RequestClose;
 
-        public void OnDialogClosed()
-        {
-            _logger.LogInformation("OnDialogClosed");
-        }
+    public void OnDialogClosed()
+    {
+        _logger.LogInformation("OnDialogClosed");
+    }
 
-        public void OnDialogOpened(IDialogParameters? parameters)
-        {
-            _logger.LogInformation($"OnDialogOpened:{parameters?.ToString()}");
-            IsDialog = true;
-        }
+    public void OnDialogOpened(IDialogParameters? parameters)
+    {
+        _logger.LogInformation($"OnDialogOpened:{parameters?.ToString()}");
+        IsDialog = true;
+    }
 
-        public void OnNavigatedTo(NavigationContext navigationContext)
-        {
-            
-        }
+    public void OnNavigatedTo(NavigationContext navigationContext)
+    {
 
-        public bool IsNavigationTarget(NavigationContext navigationContext)
-        {
-            return true;
-        }
+    }
+
+    public bool IsNavigationTarget(NavigationContext navigationContext)
+    {
+        return true;
+    }
+
+    public void OnNavigatedFrom(NavigationContext navigationContext)
+    {
 
-        public void OnNavigatedFrom(NavigationContext navigationContext)
-        {
-            
-        }
     }
 }
diff --git a/src/Lemon.ModuleNavigation.Wpf/AssemblyInfo.cs b/src/Lemon.ModuleNavigation.Wpf/AssemblyInfo.cs
index b91e514..e0dc452 100644
--- a/src/Lemon.ModuleNavigation.Wpf/AssemblyInfo.cs
+++ b/src/Lemon.ModuleNavigation.Wpf/AssemblyInfo.cs
@@ -4,6 +4,7 @@
 [assembly: XmlnsPrefix("https://github.com/NeverMorewd/Lemon.ModuleNavigation", "lm")]
 [assembly: XmlnsDefinition("https://github.com/NeverMorewd/Lemon.ModuleNavigation", "Lemon.ModuleNavigation")]
 [assembly: XmlnsDefinition("https://github.com/NeverMorewd/Lemon.ModuleNavigation", "Lemon.ModuleNavigation.Wpf")]
+[assembly: XmlnsDefinition("https://github.com/NeverMorewd/Lemon.ModuleNavigation", "Lemon.ModuleNavigation.Wpf.Regions")]
 [assembly:ThemeInfo(
     ResourceDictionaryLocation.None,            //where theme specific resource dictionaries are located
                                                 //(used if a resource is not found in the page,
diff --git a/src/Lemon.ModuleNavigation.Wpf/ContentRegion.cs b/src/Lemon.ModuleNavigation.Wpf/ContentRegion.cs
deleted file mode 100644
index df78585..0000000
--- a/src/Lemon.ModuleNavigation.Wpf/ContentRegion.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-using Lemon.ModuleNavigation.Abstractions;
-using Lemon.ModuleNavigation.Core;
-using Microsoft.Extensions.DependencyInjection;
-using System.Collections.Concurrent;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.Windows.Controls;
-
-namespace Lemon.ModuleNavigation.Wpf;
-
-public class ContentRegion : Region
-{
-    private readonly ConcurrentDictionary<string, IView> _viewNameCache = new();
-    private readonly ConcurrentItem<(IView View, INavigationAware NavigationAware)> _current = new();
-    private readonly ContentControl _contentControl;
-    public ContentRegion(ContentControl contentControl, string name) : base()
-    {
-        _contentControl = contentControl;
-        _contentControl.ContentTemplate = RegionTemplate;
-        Contexts = [];
-        Contexts.CollectionChanged += ViewContents_CollectionChanged;
-        Name = name;
-    }
-
-    public override string Name
-    {
-        get;
-    }
-    public object? Content 
-    { 
-        get => _contentControl.Content;
-        set
-        {
-            _contentControl.Content = value;
-        }
-    }
-    public override ObservableCollection<NavigationContext> Contexts
-    {
-        get;
-    }
-
-    public override void Activate(NavigationContext target)
-    {
-        if(Content is NavigationContext current)
-        {
-            if (target.TargetViewName == current.TargetViewName 
-                && !target.RequestNew)
-            {
-                return;
-            }
-        }
-        Content = target;
-        Contexts.Add(target);
-    }
-
-    public override void DeActivate(string regionName)
-    {
-        if (Content is NavigationContext current)
-        {
-            if (current.TargetViewName == regionName)
-            {
-                Contexts.Remove(current);
-                Content = null;
-            }
-        }
-    }
-    public override void DeActivate(NavigationContext navigationContext)
-    {
-        if (Content is NavigationContext current)
-        {
-            if (current == navigationContext)
-            {
-                Contexts.Remove(current);
-                Content = null;
-            }
-        }
-    }
-    private void ViewContents_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
-    {
-        if (e.Action == NotifyCollectionChangedAction.Add)
-        {
-            //
-        }
-        if (e.Action == NotifyCollectionChangedAction.Remove)
-        {
-            //
-        }
-    }
-
-    protected override IView? ResolveView(NavigationContext context)
-    {
-        bool needNewView = !_viewNameCache.TryGetValue(context.TargetViewName, out IView? view) 
-            || context.RequestNew;
-
-        if (!needNewView)
-        {
-            if (view!.DataContext is INavigationAware navigationAware 
-                && !navigationAware.IsNavigationTarget(context))
-            {
-                needNewView = true;
-            }
-        }
-
-        if (needNewView)
-        {
-            view = context.ServiceProvider.GetRequiredKeyedService<IView>(context.TargetViewName);
-            var navigationAware = context.ServiceProvider.GetRequiredKeyedService<INavigationAware>(context.TargetViewName);
-
-            if (_current.TryTakeData(out var previousData))
-            {
-                previousData.NavigationAware.OnNavigatedFrom(context);
-            }
-
-            view.DataContext = navigationAware;
-            navigationAware.OnNavigatedTo(context);
-            _current.SetData((view, navigationAware));
-            _viewNameCache[context.TargetViewName] = view;
-        }
-
-        return view;
-    }
-
-}
diff --git a/src/Lemon.ModuleNavigation.Wpf/DialogService.cs b/src/Lemon.ModuleNavigation.Wpf/DialogService.cs
index a387aac..3e0f4e7 100644
--- a/src/Lemon.ModuleNavigation.Wpf/DialogService.cs
+++ b/src/Lemon.ModuleNavigation.Wpf/DialogService.cs
@@ -1,5 +1,5 @@
 using Lemon.ModuleNavigation.Abstractions;
-using Lemon.ModuleNavigation.Dialogs;
+using Lemon.ModuleNavigation.Core;
 using Microsoft.Extensions.DependencyInjection;
 using System.Windows;
 
diff --git a/src/Lemon.ModuleNavigation.Wpf/Extensions/WpfExtensions.cs b/src/Lemon.ModuleNavigation.Wpf/Extensions/WpfExtensions.cs
index 4e457ca..8cd6063 100644
--- a/src/Lemon.ModuleNavigation.Wpf/Extensions/WpfExtensions.cs
+++ b/src/Lemon.ModuleNavigation.Wpf/Extensions/WpfExtensions.cs
@@ -1,88 +1,87 @@
 using Lemon.ModuleNavigation.Abstractions;
-using Lemon.ModuleNavigation.Wpf;
+using Lemon.ModuleNavigation.Wpf.Regions;
 using System.Windows.Controls;
 using System.Windows.Threading;
 
-namespace System.Windows
+namespace System.Windows;
+
+public static class WpfExtensions
 {
-    public static class WpfExtensions
+    public static T WaitOnDispatcherFrame<T>(this Task<T> task)
     {
-        public static T WaitOnDispatcherFrame<T>(this Task<T> task)
+        if (!task.IsCompleted)
         {
-            if (!task.IsCompleted)
-            {
-                var frame = new DispatcherFrame();
-                task.ContinueWith(static (_, s) => ((DispatcherFrame)s!).Continue = false, frame);
-                Dispatcher.PushFrame(frame);
-            }
-
-            return task.GetAwaiter().GetResult();
+            var frame = new DispatcherFrame();
+            task.ContinueWith(static (_, s) => ((DispatcherFrame)s!).Continue = false, frame);
+            Dispatcher.PushFrame(frame);
         }
 
-        public static T? FindLogicalAncestorOfType<T>(this DependencyObject obj, bool includeSelf = false) where T : DependencyObject
-        {
-            if (obj == null) throw new ArgumentNullException(nameof(obj));
+        return task.GetAwaiter().GetResult();
+    }
 
-            if (includeSelf && obj is T self)
-                return self;
+    public static T? FindLogicalAncestorOfType<T>(this DependencyObject obj, bool includeSelf = false) where T : DependencyObject
+    {
+        if (obj == null) throw new ArgumentNullException(nameof(obj));
 
-            DependencyObject? parent = LogicalTreeHelper.GetParent(obj);
-            while (parent != null)
-            {
-                if (parent is T ancestor)
-                    return ancestor;
+        if (includeSelf && obj is T self)
+            return self;
 
-                parent = LogicalTreeHelper.GetParent(parent);
-            }
+        DependencyObject? parent = LogicalTreeHelper.GetParent(obj);
+        while (parent != null)
+        {
+            if (parent is T ancestor)
+                return ancestor;
 
-            return null;
+            parent = LogicalTreeHelper.GetParent(parent);
         }
 
-        public static IRegion ToContainer(this Control control, string name)
+        return null;
+    }
+
+    public static IRegion ToRegion(this Control control, string name)
+    {
+        return control switch
         {
-            return control switch
-            {
-                TabControl tabControl => new TabRegion(tabControl, name),
-                ItemsControl itemsControl => new ItemsRegion(itemsControl, name),
-                ContentControl contentControl => new ContentRegion(contentControl, name),
-                _ => throw new NotSupportedException($"Unsupported control:{control.GetType()}"),
-            };
-        }
+            TabControl tabControl => new TabRegion(name, tabControl),
+            ItemsControl itemsControl => new ItemsRegion(name, itemsControl),
+            ContentControl contentControl => new ContentRegion(name, contentControl),
+            _ => throw new NotSupportedException($"Unsupported control:{control.GetType()}"),
+        };
+    }
 
-        public static void ScrollIntoView(this ItemsControl itemsControl, object item)
+    public static void ScrollIntoView(this ItemsControl itemsControl, object item)
+    {
+        if (itemsControl == null || item == null)
+            return;
+        if (itemsControl is ListBox listBox)
         {
-            if (itemsControl == null || item == null)
-                return;
-            if (itemsControl is ListBox listBox)
+            listBox.Dispatcher.InvokeAsync(() => listBox.ScrollIntoView(item));
+        }
+        else
+        {
+            var container = itemsControl.ItemContainerGenerator.ContainerFromItem(item) as FrameworkElement;
+            if (container != null)
             {
-                listBox.Dispatcher.InvokeAsync(() => listBox.ScrollIntoView(item));
+                container.BringIntoView();
+                return;
             }
-            else
+            itemsControl.ItemContainerGenerator.StatusChanged += (s, e) =>
             {
-                var container = itemsControl.ItemContainerGenerator.ContainerFromItem(item) as FrameworkElement;
-                if (container != null)
+                if (itemsControl.ItemContainerGenerator.Status == System.Windows.Controls.Primitives.GeneratorStatus.ContainersGenerated)
                 {
-                    container.BringIntoView();
-                    return;
+                    container = itemsControl.ItemContainerGenerator.ContainerFromItem(item) as FrameworkElement;
+                    container?.BringIntoView();
                 }
-                itemsControl.ItemContainerGenerator.StatusChanged += (s, e) =>
-                {
-                    if (itemsControl.ItemContainerGenerator.Status == System.Windows.Controls.Primitives.GeneratorStatus.ContainersGenerated)
-                    {
-                        container = itemsControl.ItemContainerGenerator.ContainerFromItem(item) as FrameworkElement;
-                        container?.BringIntoView();
-                    }
-                };
-            }
+            };
         }
+    }
 
-        public static void ScrollIntoView(this ItemsControl itemsControl, int index)
-        {
-            if (itemsControl == null || index < 0 || index >= itemsControl.Items.Count)
-                return;
+    public static void ScrollIntoView(this ItemsControl itemsControl, int index)
+    {
+        if (itemsControl == null || index < 0 || index >= itemsControl.Items.Count)
+            return;
 
-            var item = itemsControl.Items[index];
-            itemsControl.ScrollIntoView(item);
-        }
+        var item = itemsControl.Items[index];
+        itemsControl.ScrollIntoView(item);
     }
 }
diff --git a/src/Lemon.ModuleNavigation.Wpf/NavigationExtension.cs b/src/Lemon.ModuleNavigation.Wpf/NavigationExtension.cs
index 93ea194..1c86d80 100644
--- a/src/Lemon.ModuleNavigation.Wpf/NavigationExtension.cs
+++ b/src/Lemon.ModuleNavigation.Wpf/NavigationExtension.cs
@@ -2,8 +2,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Diagnostics;
-using System.Windows.Media;
 
 namespace Lemon.ModuleNavigation.Wpf;
 
@@ -32,7 +30,7 @@ void LoadedHandler(object? sender, RoutedEventArgs e)
                         var serviceProvider = navigationProvider!.ServiceProvider;
                         var handler = serviceProvider.GetRequiredService<INavigationHandler>();
                         var value = GetRegionName(control);
-                        handler.RegionManager.AddRegion(value, control.ToContainer(value));
+                        handler.RegionManager.AddRegion(value, control.ToRegion(value));
                     }
                     control.Loaded -= LoadedHandler;
                 }
@@ -56,86 +54,4 @@ public static string GetRegionName(Control element)
     }
     #endregion
 
-    #region CanUnload -- ongoing support tabcontrol only for now
-    public static readonly DependencyProperty CanUnloadProperty =
-        DependencyProperty.RegisterAttached(
-            "CanUnload", typeof(bool), typeof(NavigationExtension),
-            new PropertyMetadata(false, OnCanUnloadChanged));
-
-    public static bool GetCanUnload(DependencyObject obj) => (bool)obj.GetValue(CanUnloadProperty);
-    public static void SetCanUnload(DependencyObject obj, bool value) => obj.SetValue(CanUnloadProperty, value);
-
-    private static void OnCanUnloadChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-    {
-        if (d is Button button)
-        {
-            bool newValue = (bool)e.NewValue;
-            button.Visibility = newValue ? Visibility.Visible : Visibility.Collapsed;
-
-            if (newValue)
-            {
-                if (!_targets.Contains(button))
-                {
-                    _targets.Add(button);
-                    button.Unloaded += Button_Unloaded;
-                    button.Click += UnloadModule;
-                }
-            }
-            else
-            {
-                if (_targets.Contains(button))
-                {
-                    button.Unloaded -= Button_Unloaded;
-                    button.Click -= UnloadModule;
-                    _targets.Remove(button);
-                }
-            }
-        }
-    }
-
-    private static void Button_Unloaded(object sender, RoutedEventArgs e)
-    {
-        if (sender is Button button && _targets.Contains(button))
-        {
-            button.Unloaded -= Button_Unloaded;
-            button.Click -= UnloadModule;
-            _targets.Remove(button);
-        }
-    }
-
-    private static void UnloadModule(object sender, RoutedEventArgs e)
-    {
-        if (sender is Button button)
-        {
-            var tabItem = FindAncestor<TabItem>(button) ??
-                          throw new InvalidOperationException($"No 'TabItem' found in parents of {button}");
-
-            var tabContainer = FindAncestor<TabControl>(tabItem);
-             if (tabContainer != null) 
-            {
-                if (tabItem.DataContext is NavigationContext context)
-                {
-                    if (tabContainer.DataContext is IServiceAware serviceAware)
-                    {
-                        var regionManager = serviceAware.ServiceProvider.GetRequiredService<IRegionManager>();
-                        //regionManager.RequestUnload(context.RegionName, context.TargetViewName);
-                        regionManager.RequestUnload(context);
-                    }
-                }
-            }
-        }
-    }
-
-    private static T? FindAncestor<T>(DependencyObject current) where T : DependencyObject
-    {
-        while (current != null)
-        {
-            if (current is T ancestor)
-                return ancestor;
-            current = VisualTreeHelper.GetParent(current);
-        }
-        return null;
-    }
-    #endregion
-
 }
diff --git a/src/Lemon.ModuleNavigation.Wpf/Regions/ContentRegion.cs b/src/Lemon.ModuleNavigation.Wpf/Regions/ContentRegion.cs
new file mode 100644
index 0000000..6c83f51
--- /dev/null
+++ b/src/Lemon.ModuleNavigation.Wpf/Regions/ContentRegion.cs
@@ -0,0 +1,135 @@
+using Lemon.ModuleNavigation.Abstractions;
+using Microsoft.Extensions.DependencyInjection;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+
+namespace Lemon.ModuleNavigation.Wpf.Regions;
+
+public class ContentRegion : Region, IContentRegionContext<DataTemplate>
+{
+    private readonly ContentControl _contentControl;
+    public ContentRegion(string name, ContentControl contentControl) : base(name)
+    {
+        _contentControl = contentControl;
+        SetBindingContentTemplate();
+        SetBindingContent();
+    }
+
+    private object? _content;
+    public object? Content
+    {
+        get => _content;
+        set
+        {
+            _content = value;
+            OnPropertyChanged();
+        }
+    }
+
+    private DataTemplate? _contentTemplate;
+    public DataTemplate? ContentTemplate
+    {
+        get => _contentTemplate;
+        set
+        {
+            _contentTemplate = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public event PropertyChangedEventHandler? PropertyChanged;
+
+    public override void Activate(NavigationContext target)
+    {
+        Content = target;
+        Contexts.Add(target);
+    }
+
+    public override void DeActivate(string regionName)
+    {
+        if (Content is NavigationContext current)
+        {
+            if (current.ViewName == regionName)
+            {
+                Contexts.Remove(current);
+                Content = null;
+            }
+        }
+    }
+    public override void DeActivate(NavigationContext navigationContext)
+    {
+        if (Content is NavigationContext current)
+        {
+            if (NavigationContext.ViewNameComparer.Equals(current, navigationContext))
+            {
+                Contexts.Remove(current);
+                Content = null;
+            }
+        }
+    }
+
+    protected override IView? ResolveView(NavigationContext context)
+    {
+        bool needNewView = !ViewNameCache.TryGetValue(context.ViewName, out IView? view);
+
+        if (!needNewView)
+        {
+            if (view!.DataContext is INavigationAware navigationAware
+                && !navigationAware.IsNavigationTarget(context))
+            {
+                needNewView = true;
+            }
+        }
+
+        if (needNewView)
+        {
+            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);
+            navigationAware.RequestUnload += () =>
+            {
+                DeActivate(context);
+            };
+            Current.SetData((view, navigationAware));
+            ViewNameCache[context.ViewName] = view;
+        }
+
+        return view;
+    }
+    protected virtual void SetBindingContentTemplate()
+    {
+        ContentTemplate = RegionTemplate;
+        BindingOperations.SetBinding(_contentControl,
+            ContentControl.ContentTemplateProperty,
+            new Binding
+            {
+                Source = this,
+                Path = new PropertyPath(nameof(ContentTemplate)),
+            });
+    }
+    protected virtual void SetBindingContent()
+    {
+        BindingOperations.SetBinding(_contentControl,
+            ContentControl.ContentProperty,
+            new Binding
+            {
+                Source = this,
+                Path = new PropertyPath(nameof(Content)),
+                Mode = BindingMode.TwoWay
+            });
+    }
+    protected void OnPropertyChanged([CallerMemberName] string? propertyName = null)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
+}
diff --git a/src/Lemon.ModuleNavigation.Wpf/ItemsRegion.cs b/src/Lemon.ModuleNavigation.Wpf/Regions/ItemsRegion.cs
similarity index 56%
rename from src/Lemon.ModuleNavigation.Wpf/ItemsRegion.cs
rename to src/Lemon.ModuleNavigation.Wpf/Regions/ItemsRegion.cs
index a23b7f4..e1b4602 100644
--- a/src/Lemon.ModuleNavigation.Wpf/ItemsRegion.cs
+++ b/src/Lemon.ModuleNavigation.Wpf/Regions/ItemsRegion.cs
@@ -1,55 +1,49 @@
 using Lemon.ModuleNavigation.Abstractions;
 using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
+using System.Windows.Data;
 
-namespace Lemon.ModuleNavigation.Wpf;
+namespace Lemon.ModuleNavigation.Wpf.Regions;
 
-public class ItemsRegion : Region
+public class ItemsRegion : Region, IItemsRegionDataContext<DataTemplate>
 {
     private readonly ItemsControl _itemsControl;
-    public ItemsRegion(ItemsControl itemsControl, string name)
+    public ItemsRegion(string name, ItemsControl itemsControl) : base(name)
     {
         _itemsControl = itemsControl;
-        _itemsControl.ItemTemplate = RegionTemplate;
-        Contexts = [];
-        Contexts.CollectionChanged += ViewContents_CollectionChanged;
-        Name = name;
-    }
-    public override string Name
-    {
-        get;
+        SetBindingItemTemplate();
+        SetBindingSelectedItem();
+        SetBindingItemsSource();
     }
+    private object? _selectItem;
     public object? SelectedItem
     {
         get
         {
-            if (_itemsControl is Selector selecting)
-            {
-                return selecting.SelectedItem;
-            }
-            return null;
+            return _selectItem;
         }
         set
         {
-            if (value != null)
-            {
-                if (_itemsControl is Selector selecting)
-                {
-                    selecting.SelectedItem = value;
-                }
-            }
+            _selectItem = value;
+            OnPropertyChanged();
         }
     }
 
-    public override ObservableCollection<NavigationContext> Contexts
+    private DataTemplate? _itemsTemplate;
+    public DataTemplate? ItemTemplate
     {
-        get;
+        get => _itemsTemplate;
+        set
+        {
+            _itemsTemplate = value;
+            OnPropertyChanged();
+        }
     }
+    public event PropertyChangedEventHandler? PropertyChanged;
 
     public override void ScrollIntoView(int index)
     {
@@ -90,7 +84,7 @@ public override void Activate(NavigationContext target)
     }
     public override void DeActivate(string viewName)
     {
-        Contexts.Remove(Contexts.Last(c => c.TargetViewName == viewName));
+        Contexts.Remove(Contexts.Last(c => c.ViewName == viewName));
     }
     public override void DeActivate(NavigationContext navigationContext)
     {
@@ -100,29 +94,6 @@ public void Add(NavigationContext item)
     {
         Contexts.Add(item);
     }
-    private void ViewContents_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
-    {
-        if (e.Action == NotifyCollectionChangedAction.Add)
-        {
-            if (e.NewItems != null)
-            {
-                foreach (var item in e.NewItems)
-                {
-                    _itemsControl.Items.Add(item);
-                }
-            }
-        }
-        if (e.Action == NotifyCollectionChangedAction.Remove)
-        {
-            if (e.OldItems != null)
-            {
-                foreach (var item in e.OldItems)
-                {
-                    _itemsControl.Items.Remove(item);
-                }
-            }
-        }
-    }
 
     protected override IView? ResolveView(NavigationContext context)
     {
@@ -130,7 +101,7 @@ private void ViewContents_CollectionChanged(object? sender, NotifyCollectionChan
 
         if (!needNewView)
         {
-            if (view!.DataContext is INavigationAware navigationAware 
+            if (view!.DataContext is INavigationAware navigationAware
                 && !navigationAware.IsNavigationTarget(context))
             {
                 needNewView = true;
@@ -139,8 +110,8 @@ private void ViewContents_CollectionChanged(object? sender, NotifyCollectionChan
 
         if (needNewView)
         {
-            view = context.ServiceProvider.GetRequiredKeyedService<IView>(context.TargetViewName);
-            var navigationAware = context.ServiceProvider.GetRequiredKeyedService<INavigationAware>(context.TargetViewName);
+            view = context.ServiceProvider.GetRequiredKeyedService<IView>(context.ViewName);
+            var navigationAware = context.ServiceProvider.GetRequiredKeyedService<INavigationAware>(context.ViewName);
 
             if (Current.TryTakeData(out var previousData))
             {
@@ -149,10 +120,48 @@ private void ViewContents_CollectionChanged(object? sender, NotifyCollectionChan
 
             view.DataContext = navigationAware;
             navigationAware.OnNavigatedTo(context);
+            navigationAware.RequestUnload += () =>
+            {
+                DeActivate(context);
+            };
             Current.SetData((view, navigationAware));
             ViewCache[context.Guid] = view;
         }
 
         return view;
     }
+
+    protected virtual void SetBindingItemsSource()
+    {
+        BindingOperations.SetBinding(_itemsControl, ItemsControl.ItemsSourceProperty, new Binding
+        {
+            Source = this,
+            Path = new PropertyPath(nameof(Contexts)),
+        });
+    }
+    protected virtual void SetBindingItemTemplate()
+    {
+        ItemTemplate = RegionTemplate;
+        BindingOperations.SetBinding(_itemsControl, ItemsControl.ItemTemplateProperty, new Binding
+        {
+            Source = this,
+            Path = new PropertyPath(nameof(ItemTemplate)),
+        });
+    }
+    protected virtual void SetBindingSelectedItem()
+    {
+        if (_itemsControl is Selector selector)
+        {
+            BindingOperations.SetBinding(selector, Selector.SelectedItemProperty, new Binding
+            {
+                Source = this,
+                Path = new PropertyPath(nameof(SelectedItem)),
+                Mode = BindingMode.TwoWay
+            });
+        }
+    }
+    protected void OnPropertyChanged([CallerMemberName] string? propertyName = null)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
 }
diff --git a/src/Lemon.ModuleNavigation.Wpf/Region.cs b/src/Lemon.ModuleNavigation.Wpf/Regions/Region.cs
similarity index 62%
rename from src/Lemon.ModuleNavigation.Wpf/Region.cs
rename to src/Lemon.ModuleNavigation.Wpf/Regions/Region.cs
index 85ad1b5..de66db9 100644
--- a/src/Lemon.ModuleNavigation.Wpf/Region.cs
+++ b/src/Lemon.ModuleNavigation.Wpf/Regions/Region.cs
@@ -1,23 +1,24 @@
 using Lemon.ModuleNavigation.Abstractions;
 using Lemon.ModuleNavigation.Core;
-using Microsoft.Extensions.DependencyInjection;
 using System.Collections.Concurrent;
 using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
+using System.Collections.Specialized;
 using System.Windows;
 using System.Windows.Controls;
 
-namespace Lemon.ModuleNavigation.Wpf;
+namespace Lemon.ModuleNavigation.Wpf.Regions;
 
-public abstract class Region : IRegion, INotifyPropertyChanged
+public abstract class Region : IRegion
 {
-    public Region()
+    public Region(string name)
     {
+        Name = name;
         Current = new();
         ViewCache = [];
         ViewNameCache = [];
+        Contexts = [];
         RegionTemplate = CreateRegionDataTemplate();
+        Contexts.CollectionChanged += Contexts_CollectionChanged;
     }
 
     protected ConcurrentDictionary<Guid, IView> ViewCache
@@ -32,12 +33,12 @@ protected ConcurrentDictionary<string, IView> ViewNameCache
     {
         get;
     }
-    public abstract string Name
+    public string Name
     {
         get;
     }
 
-    public abstract ObservableCollection<NavigationContext> Contexts
+    public ObservableCollection<NavigationContext> Contexts
     {
         get;
     }
@@ -45,13 +46,6 @@ public abstract ObservableCollection<NavigationContext> Contexts
     public DataTemplate? RegionTemplate
     {
         get;
-        private set;
-    }
-
-    public event PropertyChangedEventHandler? PropertyChanged;
-    protected void OnPropertyChanged([CallerMemberName] string? propertyName = null)
-    {
-        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
     }
 
     public virtual void ScrollIntoView(int index)
@@ -66,48 +60,43 @@ public virtual void ScrollIntoView(NavigationContext item)
     public abstract void DeActivate(string viewName);
     public abstract void DeActivate(NavigationContext target);
 
-    private DataTemplate CreateRegionDataTemplate()
+    protected abstract IView? ResolveView(NavigationContext context);
+
+    protected virtual void WhenContextsAdded(IEnumerable<NavigationContext> contexts)
     {
-        var dataTemplate = new DataTemplate(typeof(NavigationContext));
-        FrameworkElementFactory factory = new(typeof(ContentPresenter));
-        factory.SetBinding(ContentPresenter.ContentProperty, new System.Windows.Data.Binding()
-        {
-            Converter = new NavigationContextToViewConverter(this)
-        });
-        dataTemplate.VisualTree = factory;
-        return dataTemplate;
-    }
 
-    protected virtual IView? ResolveView(NavigationContext context)
+    }
+    protected virtual void WhenContextsRemoved(IEnumerable<NavigationContext> contexts)
     {
-        bool needNewView = !ViewNameCache.TryGetValue(context.TargetViewName, out IView? view);
 
-        if (!needNewView)
+    }
+    private void Contexts_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+    {
+        if (e.Action == NotifyCollectionChangedAction.Add)
         {
-            if (view!.DataContext is INavigationAware navigationAware
-                && !navigationAware.IsNavigationTarget(context))
+            if (e.NewItems is not null)
             {
-                needNewView = true;
+                WhenContextsAdded(e.NewItems.Cast<NavigationContext>());
             }
         }
-
-        if (needNewView)
+        if (e.Action == NotifyCollectionChangedAction.Remove)
         {
-            view = context.ServiceProvider.GetRequiredKeyedService<IView>(context.TargetViewName);
-            var navigationAware = context.ServiceProvider.GetRequiredKeyedService<INavigationAware>(context.TargetViewName);
-
-            if (Current.TryTakeData(out var previousData))
+            if (e.OldItems is not null)
             {
-                previousData.NavigationAware.OnNavigatedFrom(context);
+                WhenContextsRemoved(e.OldItems.Cast<NavigationContext>());
             }
-
-            view.DataContext = navigationAware;
-            navigationAware.OnNavigatedTo(context);
-            Current.SetData((view, navigationAware));
-            ViewNameCache[context.TargetViewName] = view;
         }
-
-        return view;
+    }
+    private DataTemplate CreateRegionDataTemplate()
+    {
+        var dataTemplate = new DataTemplate(typeof(NavigationContext));
+        FrameworkElementFactory factory = new(typeof(ContentPresenter));
+        factory.SetBinding(ContentPresenter.ContentProperty, new System.Windows.Data.Binding()
+        {
+            Converter = new NavigationContextToViewConverter(this)
+        });
+        dataTemplate.VisualTree = factory;
+        return dataTemplate;
     }
 
     private class NavigationContextToViewConverter : System.Windows.Data.IValueConverter
diff --git a/src/Lemon.ModuleNavigation.Wpf/Regions/TabRegion.cs b/src/Lemon.ModuleNavigation.Wpf/Regions/TabRegion.cs
new file mode 100644
index 0000000..59232db
--- /dev/null
+++ b/src/Lemon.ModuleNavigation.Wpf/Regions/TabRegion.cs
@@ -0,0 +1,48 @@
+using Lemon.ModuleNavigation.Abstractions;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+
+namespace Lemon.ModuleNavigation.Wpf.Regions;
+
+public class TabRegion : ItemsRegion, IContentRegionContext<DataTemplate>
+{
+    private readonly TabControl _tabControl;
+    public TabRegion(string name, TabControl tabControl) : base(name, tabControl)
+    {
+        _tabControl = tabControl;
+        ContentTemplate = RegionTemplate;
+        SetBindingContentTemplate();
+    }
+    public object? Content
+    {
+        get;
+        set;
+    }
+
+    private DataTemplate? _contentTemplate;
+    public DataTemplate? ContentTemplate
+    {
+        get => _contentTemplate;
+        set
+        {
+            _contentTemplate = value;
+            OnPropertyChanged();
+        }
+    }
+    protected override void SetBindingItemTemplate()
+    {
+        //
+    }
+
+    protected virtual void SetBindingContentTemplate()
+    {
+        BindingOperations.SetBinding(_tabControl,
+            TabControl.ContentTemplateProperty,
+            new Binding
+            {
+                Source = this,
+                Path = new PropertyPath(nameof(ContentTemplate)),
+            });
+    }
+}
diff --git a/src/Lemon.ModuleNavigation.Wpf/TabRegion.cs b/src/Lemon.ModuleNavigation.Wpf/TabRegion.cs
deleted file mode 100644
index 026e2ef..0000000
--- a/src/Lemon.ModuleNavigation.Wpf/TabRegion.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-using Lemon.ModuleNavigation.Abstractions;
-using Lemon.ModuleNavigation.Core;
-using Microsoft.Extensions.DependencyInjection;
-using System.Collections.Concurrent;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-
-namespace Lemon.ModuleNavigation.Wpf;
-
-public class TabRegion : Region
-{
-    private readonly TabControl _tabControl;
-    public TabRegion(TabControl tabControl, string name)
-    {
-        _tabControl = tabControl;
-        _tabControl.ContentTemplate = RegionTemplate;
-        Contexts = [];
-        Contexts.CollectionChanged += ViewContents_CollectionChanged;
-        Name = name;
-        BindingOperations.SetBinding(_tabControl, Selector.SelectedItemProperty, new Binding
-        {
-            Source = this,
-            Path = new PropertyPath(nameof(SelectedItem)),
-            Mode = BindingMode.TwoWay
-        });
-        BindingOperations.SetBinding(_tabControl, ItemsControl.ItemsSourceProperty, new Binding
-        {
-            Source = this,
-            Path = new PropertyPath(nameof(SelectedItem)),
-            Mode = BindingMode.TwoWay
-        });
-    }
-    public override string Name
-    {
-        get;
-    }
-    private object? _selectItem;
-    public object? SelectedItem
-    {
-        get
-        {
-            return _selectItem;
-        }
-        set
-        {
-            _selectItem = value;
-            OnPropertyChanged();
-        }
-    }
-    public override ObservableCollection<NavigationContext> Contexts
-    {
-        get;
-    }
-
-    public override void Activate(NavigationContext target)
-    {
-        if (!target.RequestNew)
-        {
-            var targetContext = Contexts.FirstOrDefault(context =>
-            {
-                if (NavigationContext.ViewNameComparer.Equals(target, context))
-                {
-                    return true;
-                }
-                return false;
-            });
-            if (targetContext == null)
-            {
-                Contexts.Add(target);
-                SelectedItem = target;
-            }
-            else
-            {
-                SelectedItem = targetContext;
-            }
-        }
-        else
-        {
-            Contexts.Add(target);
-            SelectedItem = target;
-        }
-    }
-    public override void DeActivate(string viewName)
-    {
-        Contexts.Remove(Contexts.Last(c => c.TargetViewName == viewName));
-    }
-    public override void DeActivate(NavigationContext navigationContext)
-    {
-        Contexts.Remove(navigationContext);
-    }
-    public void Add(NavigationContext item)
-    {
-        Contexts.Add(item);
-    }
-    private void ViewContents_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
-    {
-        if (e.Action == NotifyCollectionChangedAction.Add)
-        {
-            if (e.NewItems != null)
-            {
-                foreach (var item in e.NewItems)
-                {
-                    _tabControl.Items.Add(item);
-                }
-            }
-        }
-        if (e.Action == NotifyCollectionChangedAction.Remove)
-        {
-            if (e.OldItems != null)
-            {
-                foreach (var item in e.OldItems)
-                {
-                    _tabControl.Items.Remove(item);
-                }
-            }
-        }
-    }
-
-
-    protected override IView? ResolveView(NavigationContext context)
-    {
-        bool needNewView = !ViewCache.TryGetValue(context.Guid, out IView? view);
-
-        if (!needNewView)
-        {
-            var navigationAware = view!.DataContext as INavigationAware;
-            if (navigationAware != null && !navigationAware.IsNavigationTarget(context))
-            {
-                needNewView = true;
-            }
-        }
-
-        if (needNewView)
-        {
-            view = context.ServiceProvider.GetRequiredKeyedService<IView>(context.TargetViewName);
-            var navigationAware = context.ServiceProvider.GetRequiredKeyedService<INavigationAware>(context.TargetViewName);
-
-            if (Current.TryTakeData(out var previousData))
-            {
-                previousData.NavigationAware.OnNavigatedFrom(context);
-            }
-
-            view.DataContext = navigationAware;
-            navigationAware.OnNavigatedTo(context);
-            Current.SetData((view, navigationAware));
-            ViewCache[context.Guid] = view;
-        }
-
-        return view;
-    }
-}
diff --git a/src/Lemon.ModuleNavigation.WpfSample/App.xaml.cs b/src/Lemon.ModuleNavigation.WpfSample/App.xaml.cs
index 755dbbb..607be71 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/App.xaml.cs
+++ b/src/Lemon.ModuleNavigation.WpfSample/App.xaml.cs
@@ -15,12 +15,8 @@ protected override void OnStartup(StartupEventArgs e)
     {
         var services = new ServiceCollection();
         services.AddWpfNavigationSupport()
-                //.AddModule<ModuleA>()
-                //.AddModule<ModuleB>()
-                //.AddModule<ModuleC>()
                 .AddSingleton<MainWindow>()
                 .AddSingleton<MainWindowViewModel>()
-                //.AddDialogWindow<CustomDialogWindow>(nameof(CustomDialogWindow))
                 .AddView<ViewAlpha, ViewAlphaViewModel>(nameof(ViewAlpha))
                 .AddView<ViewBeta, ViewBetaViewModel>(nameof(ViewBeta));
 
diff --git a/src/Lemon.ModuleNavigation.WpfSample/BaseViewModel.cs b/src/Lemon.ModuleNavigation.WpfSample/BaseNavigationViewModel.cs
similarity index 54%
rename from src/Lemon.ModuleNavigation.WpfSample/BaseViewModel.cs
rename to src/Lemon.ModuleNavigation.WpfSample/BaseNavigationViewModel.cs
index 7f39959..0ddc219 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/BaseViewModel.cs
+++ b/src/Lemon.ModuleNavigation.WpfSample/BaseNavigationViewModel.cs
@@ -1,12 +1,30 @@
 using Lemon.ModuleNavigation.Abstractions;
-using Lemon.ModuleNavigation.Core;
 using ReactiveUI;
+using System.Diagnostics;
+using System.Reactive;
 
 namespace Lemon.ModuleNavigation.WpfSample;
 
-public class BaseViewModel : ReactiveObject, INavigationAware
+public class BaseNavigationViewModel : ReactiveObject, INavigationAware
 {
     public virtual string Greeting => $"Welcome to {GetType().Name}[{Environment.ProcessId}][{Environment.CurrentManagedThreadId}]{Environment.NewLine}{DateTime.Now:yyyy-MM-dd HH-mm-ss.ffff}";
+
+    public BaseNavigationViewModel()
+    {
+        UnloadViewCommand = ReactiveCommand.Create(() =>
+        {
+            var code = this.GetHashCode();
+            Debug.WriteLine(code);
+            RequestUnload?.Invoke();
+        });
+    }
+    public ReactiveCommand<Unit,Unit> UnloadViewCommand
+    {
+        get;
+    }
+
+    public event Action? RequestUnload;
+
     public virtual bool IsNavigationTarget(NavigationContext navigationContext)
     {
         return true;
@@ -14,7 +32,7 @@ public virtual bool IsNavigationTarget(NavigationContext navigationContext)
 
     public virtual void OnNavigatedFrom(NavigationContext navigationContext)
     {
-        //throw new NotImplementedException();
+       //throw new NotImplementedException();
     }
 
     public virtual void OnNavigatedTo(NavigationContext navigationContext)
diff --git a/src/Lemon.ModuleNavigation.WpfSample/BoolToVisibilityConverter.cs b/src/Lemon.ModuleNavigation.WpfSample/BoolToVisibilityConverter.cs
new file mode 100644
index 0000000..5ec9e7a
--- /dev/null
+++ b/src/Lemon.ModuleNavigation.WpfSample/BoolToVisibilityConverter.cs
@@ -0,0 +1,34 @@
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Lemon.ModuleNavigation.WpfSample;
+
+public class BoolToVisibilityConverter : IValueConverter
+{
+    public bool Inverse { get; set; } = false;
+
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (value is bool boolValue)
+        {
+            if (Inverse)
+                return boolValue ? Visibility.Collapsed : Visibility.Visible;
+            else
+                return boolValue ? Visibility.Visible : Visibility.Collapsed;
+        }
+        return Visibility.Collapsed;
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (value is Visibility visibility)
+        {
+            if (Inverse)
+                return visibility != Visibility.Visible;
+            else
+                return visibility == Visibility.Visible;
+        }
+        return false;
+    }
+}
diff --git a/src/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml b/src/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml
index 56937b3..4d77e85 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml
+++ b/src/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml
@@ -57,14 +57,14 @@
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock Text="{Binding}" />
                                         <Button
-                                            lm:NavigationExtension.CanUnload="True"
+                                            Content="x"
+                                            ToolTip="UnloadView"
                                             Width="20"
                                             Height="20"
-                                            Padding="-1,0,0,0"
                                             HorizontalContentAlignment="Center"
                                             VerticalContentAlignment="Center"
-                                            Content="X"
-                                            FontSize="11" />
+                                            Command="{Binding DataContext.UnloadViewCommand, RelativeSource={RelativeSource AncestorType=TabControl}}"
+                                            CommandParameter="{Binding}" />
                                     </StackPanel>
                                 </DataTemplate>
                             </TabControl.ItemTemplate>
diff --git a/src/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml.cs b/src/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml.cs
index 78f08e8..7dc98c1 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml.cs
+++ b/src/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml.cs
@@ -1,13 +1,4 @@
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using System.Windows;
 
 namespace Lemon.ModuleNavigation.WpfSample;
 
diff --git a/src/Lemon.ModuleNavigation.WpfSample/MainWindowViewModel.cs b/src/Lemon.ModuleNavigation.WpfSample/MainWindowViewModel.cs
index 3859d29..6d9ea8f 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/MainWindowViewModel.cs
+++ b/src/Lemon.ModuleNavigation.WpfSample/MainWindowViewModel.cs
@@ -1,22 +1,23 @@
 using Lemon.ModuleNavigation.Abstractions;
 using Lemon.ModuleNavigation.Core;
-using Lemon.ModuleNavigation.Dialogs;
 using ReactiveUI;
-using Splat;
 using System.Diagnostics;
 using System.Reactive;
 
 namespace Lemon.ModuleNavigation.WpfSample;
 
-public class MainWindowViewModel : BaseViewModel, IServiceAware
+public class MainWindowViewModel : ReactiveObject, IServiceAware
 {
     private readonly INavigationService _navigationService;
     private readonly IDialogService _dialogService;
+    private readonly IRegionManager _regionManager;
     public MainWindowViewModel(INavigationService navigationService, 
-        IDialogService dialogService, 
+        IDialogService dialogService,
+        IRegionManager regionManager,
         IServiceProvider serviceProvider)
     {
         _dialogService = dialogService;
+        _regionManager = regionManager;
         _navigationService = navigationService;
         _navigationService.RequestViewNavigation("ContentRegion", "ViewAlpha", false);
         ServiceProvider = serviceProvider;
@@ -79,6 +80,10 @@ await _dialogService.ShowDialog(content,
                 });
             Debug.WriteLine($"ShowDialog over:{result}");
         });
+        UnloadViewCommand = ReactiveCommand.Create<NavigationContext>((context) =>
+        {
+            _regionManager.RequestUnload(context);
+        });
 
     }
 
@@ -86,7 +91,10 @@ public IServiceProvider ServiceProvider
     {
         get;
     }
-
+    public ReactiveCommand<NavigationContext, Unit> UnloadViewCommand
+    {
+        get;
+    }
     public ReactiveCommand<string, Unit> NavigateToViewCommand
     {
         get;
diff --git a/src/Lemon.ModuleNavigation.WpfSample/ViewModels/ViewAlphaViewModel.cs b/src/Lemon.ModuleNavigation.WpfSample/ViewModels/ViewAlphaViewModel.cs
index 08adb9b..fb30065 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/ViewModels/ViewAlphaViewModel.cs
+++ b/src/Lemon.ModuleNavigation.WpfSample/ViewModels/ViewAlphaViewModel.cs
@@ -1,11 +1,11 @@
 using Lemon.ModuleNavigation.Abstractions;
-using Lemon.ModuleNavigation.Dialogs;
+using Lemon.ModuleNavigation.Core;
 using ReactiveUI;
 using System.Reactive;
 
 namespace Lemon.ModuleNavigation.WpfSample.ViewModels;
 
-public class ViewAlphaViewModel : BaseViewModel, IDialogAware
+public class ViewAlphaViewModel : BaseNavigationViewModel, IDialogAware
 {
     public ViewAlphaViewModel()
     {
@@ -42,4 +42,9 @@ public void OnDialogOpened(IDialogParameters? parameters)
     {
         IsDialog = true;
     }
+
+    public override bool IsNavigationTarget(NavigationContext navigationContext)
+    {
+        return !navigationContext.RequestNew;
+    }
 }
diff --git a/src/Lemon.ModuleNavigation.WpfSample/ViewModels/ViewBetaViewModel.cs b/src/Lemon.ModuleNavigation.WpfSample/ViewModels/ViewBetaViewModel.cs
index bb2eb35..df5088a 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/ViewModels/ViewBetaViewModel.cs
+++ b/src/Lemon.ModuleNavigation.WpfSample/ViewModels/ViewBetaViewModel.cs
@@ -1,11 +1,11 @@
 using Lemon.ModuleNavigation.Abstractions;
-using Lemon.ModuleNavigation.Dialogs;
+using Lemon.ModuleNavigation.Core;
 using ReactiveUI;
 using System.Reactive;
 
 namespace Lemon.ModuleNavigation.WpfSample.ViewModels;
 
-public class ViewBetaViewModel : BaseViewModel, IDialogAware
+public class ViewBetaViewModel : BaseNavigationViewModel, IDialogAware
 {
     public string Title => nameof(ViewBetaViewModel);
 
@@ -38,4 +38,8 @@ public void OnDialogOpened(IDialogParameters? parameters)
     {
         IsDialog = true;
     }
+    public override bool IsNavigationTarget(NavigationContext navigationContext)
+    {
+        return !navigationContext.RequestNew;
+    }
 }
diff --git a/src/Lemon.ModuleNavigation.WpfSample/Views/ViewAlpha.xaml b/src/Lemon.ModuleNavigation.WpfSample/Views/ViewAlpha.xaml
index 355d9c9..3421ddb 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/Views/ViewAlpha.xaml
+++ b/src/Lemon.ModuleNavigation.WpfSample/Views/ViewAlpha.xaml
@@ -1,20 +1,34 @@
-<UserControl x:Class="Lemon.ModuleNavigation.WpfSample.Views.ViewAlpha"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Lemon.ModuleNavigation.WpfSample.Views"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <Border BorderThickness="1" BorderBrush="LemonChiffon">
+<UserControl
+    x:Class="Lemon.ModuleNavigation.WpfSample.Views.ViewAlpha"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:default="clr-namespace:Lemon.ModuleNavigation.WpfSample"
+    xmlns:local="clr-namespace:Lemon.ModuleNavigation.WpfSample.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <UserControl.Resources>
+        <default:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" Inverse="False" />
+        <default:BoolToVisibilityConverter x:Key="BoolToVisibilityConverterInverse" Inverse="True" />
+    </UserControl.Resources>
+    <Border
+        Background="IndianRed"
+        BorderBrush="LemonChiffon"
+        BorderThickness="1">
         <StackPanel>
             <TextBlock Text="{Binding Greeting}" />
             <Button
-			IsEnabled="{Binding IsDialog}"
-            Width="200"
-            Height="50"
-            Command="{Binding CloseCommand}"
-            Content="CloseDialog" />
+                HorizontalContentAlignment="Center"
+                VerticalContentAlignment="Center"
+                Command="{Binding UnloadViewCommand}"
+                Content="UnloadView"
+                Visibility="{Binding IsDialog, Converter={StaticResource BoolToVisibilityConverterInverse}}"/>
+            <Button
+                Command="{Binding CloseCommand}"
+                Content="CloseDialog"
+                Visibility="{Binding IsDialog, Converter={StaticResource BoolToVisibilityConverter}}" />
         </StackPanel>
     </Border>
 </UserControl>
diff --git a/src/Lemon.ModuleNavigation.WpfSample/Views/ViewBeta.xaml b/src/Lemon.ModuleNavigation.WpfSample/Views/ViewBeta.xaml
index 7f72f9b..4041af2 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/Views/ViewBeta.xaml
+++ b/src/Lemon.ModuleNavigation.WpfSample/Views/ViewBeta.xaml
@@ -1,20 +1,34 @@
-<UserControl x:Class="Lemon.ModuleNavigation.WpfSample.Views.ViewBeta"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Lemon.ModuleNavigation.WpfSample.Views"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <Border BorderThickness="1" BorderBrush="LemonChiffon">
+<UserControl
+    x:Class="Lemon.ModuleNavigation.WpfSample.Views.ViewBeta"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:default="clr-namespace:Lemon.ModuleNavigation.WpfSample"
+    xmlns:local="clr-namespace:Lemon.ModuleNavigation.WpfSample.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <UserControl.Resources>
+        <default:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" Inverse="False" />
+        <default:BoolToVisibilityConverter x:Key="BoolToVisibilityConverterInverse" Inverse="True" />
+    </UserControl.Resources>
+    <Border
+        Background="CadetBlue"
+        BorderBrush="LemonChiffon"
+        BorderThickness="1">
         <StackPanel>
             <TextBlock Text="{Binding Greeting}" />
             <Button
-			IsEnabled="{Binding IsDialog}"
-            Width="200"
-            Height="50"
-            Command="{Binding CloseCommand}"
-            Content="CloseDialog" />
+                HorizontalContentAlignment="Center"
+                VerticalContentAlignment="Center"
+                Command="{Binding UnloadViewCommand}"
+                Content="UnloadView"
+                Visibility="{Binding IsDialog, Converter={StaticResource BoolToVisibilityConverterInverse}}" />
+            <Button
+                Command="{Binding CloseCommand}"
+                Content="CloseDialog"
+                Visibility="{Binding IsDialog, Converter={StaticResource BoolToVisibilityConverter}}" />
         </StackPanel>
     </Border>
 </UserControl>
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IContentRegionContext{TDataTemplate}.cs b/src/Lemon.ModuleNavigation/Abstractions/IContentRegionContext{TDataTemplate}.cs
new file mode 100644
index 0000000..95c4262
--- /dev/null
+++ b/src/Lemon.ModuleNavigation/Abstractions/IContentRegionContext{TDataTemplate}.cs
@@ -0,0 +1,10 @@
+using System.ComponentModel;
+
+namespace Lemon.ModuleNavigation.Abstractions;
+
+public interface IContentRegionContext<TDataTemplate> : INotifyPropertyChanged
+{
+    object? Content { get; set; }
+    TDataTemplate? ContentTemplate { get; set; }
+}
+
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IContentRegion{TDataTemplate}.cs b/src/Lemon.ModuleNavigation/Abstractions/IContentRegion{TDataTemplate}.cs
deleted file mode 100644
index 71b895a..0000000
--- a/src/Lemon.ModuleNavigation/Abstractions/IContentRegion{TDataTemplate}.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Lemon.ModuleNavigation.Abstractions;
-
-namespace Lemon.ModuleNavigation.Regions;
-
-public interface IContentRegion<TDataTemplate> : IRegion
-{
-    public object? Content
-    {
-        get;
-        set;
-    }
-    TDataTemplate? RegionTemplate
-    {
-        get;
-        set;
-    }
-}
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IDialogResult.cs b/src/Lemon.ModuleNavigation/Abstractions/IDialogResult.cs
index 3c47ebe..f008b28 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IDialogResult.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IDialogResult.cs
@@ -1,17 +1,16 @@
-using Lemon.ModuleNavigation.Dialogs;
+using Lemon.ModuleNavigation.Core;
 
-namespace Lemon.ModuleNavigation.Abstractions
+namespace Lemon.ModuleNavigation.Abstractions;
+
+public interface IDialogResult
 {
-    public interface IDialogResult
-    {
-        /// <summary>
-        /// The parameters from the dialog.
-        /// </summary>
-        IDialogParameters Parameters { get; }
+    /// <summary>
+    /// The parameters from the dialog.
+    /// </summary>
+    IDialogParameters Parameters { get; }
 
-        /// <summary>
-        /// The result of the dialog.
-        /// </summary>
-        ButtonResult Result { get; }
-    }
+    /// <summary>
+    /// The result of the dialog.
+    /// </summary>
+    ButtonResult Result { get; }
 }
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IItemsRegionDataContext{TDataTemplate}.cs b/src/Lemon.ModuleNavigation/Abstractions/IItemsRegionDataContext{TDataTemplate}.cs
new file mode 100644
index 0000000..10deafd
--- /dev/null
+++ b/src/Lemon.ModuleNavigation/Abstractions/IItemsRegionDataContext{TDataTemplate}.cs
@@ -0,0 +1,17 @@
+using System.ComponentModel;
+
+namespace Lemon.ModuleNavigation.Abstractions;
+
+public interface IItemsRegionDataContext<TDataTemplate> : INotifyPropertyChanged
+{
+    object? SelectedItem
+    {
+        get;
+        set;
+    }
+    TDataTemplate? ItemTemplate
+    {
+        get;
+        set;
+    }
+}
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IItemsRegion{TDataTemplate}.cs b/src/Lemon.ModuleNavigation/Abstractions/IItemsRegion{TDataTemplate}.cs
deleted file mode 100644
index 45cef62..0000000
--- a/src/Lemon.ModuleNavigation/Abstractions/IItemsRegion{TDataTemplate}.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Lemon.ModuleNavigation.Abstractions;
-
-namespace Lemon.ModuleNavigation.Regions;
-
-public interface IItemsRegion<TDataTemplate> : IRegion
-{
-    object? SelectedItem
-    {
-        get;
-        set;
-    }
-    TDataTemplate? RegionTemplate
-    {
-        get;
-        set;
-    }
-    void ScrollIntoView(int index);
-    void ScrollIntoView(object item);
-    void Add(object item);
-}
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationHandler.cs b/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationHandler.cs
index 647e786..e85ea50 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationHandler.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationHandler.cs
@@ -1,9 +1,8 @@
 using Lemon.ModuleNavigation.Core;
 
-namespace Lemon.ModuleNavigation.Abstractions
+namespace Lemon.ModuleNavigation.Abstractions;
+
+public interface IModuleNavigationHandler
 {
-    public interface IModuleNavigationHandler
-    {
-        void OnNavigateTo(string moduleKey, NavigationParameters parameters);
-    }
+    void OnNavigateTo(string moduleKey, NavigationParameters parameters);
 }
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationHandler{T}.cs b/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationHandler{T}.cs
index 5d19fff..688c201 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationHandler{T}.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationHandler{T}.cs
@@ -1,9 +1,8 @@
 using Lemon.ModuleNavigation.Core;
 
-namespace Lemon.ModuleNavigation.Abstractions
+namespace Lemon.ModuleNavigation.Abstractions;
+
+public interface IModuleNavigationHandler<in T> :IModuleNavigationHandler where T : IModule
 {
-    public interface IModuleNavigationHandler<in T> :IModuleNavigationHandler where T : IModule
-    {
-        void OnNavigateTo(T module, NavigationParameters parameter);
-    }
+    void OnNavigateTo(T module, NavigationParameters parameter);
 }
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationService.cs b/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationService.cs
index 74b394f..625aa4b 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationService.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationService.cs
@@ -1,10 +1,9 @@
 using Lemon.ModuleNavigation.Core;
 
-namespace Lemon.ModuleNavigation.Abstractions
+namespace Lemon.ModuleNavigation.Abstractions;
+
+public interface IModuleNavigationService
 {
-    public interface IModuleNavigationService
-    {
-        IDisposable BindingNavigationHandler(IModuleNavigationHandler handler);
-        void RequestModuleNavigate(string moduleKey, NavigationParameters parameters);
-    }
+    IDisposable BindingNavigationHandler(IModuleNavigationHandler handler);
+    void RequestModuleNavigate(string moduleKey, NavigationParameters parameters);
 }
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationService{T}.cs b/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationService{T}.cs
index 74541d7..9df7741 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationService{T}.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationService{T}.cs
@@ -1,10 +1,9 @@
 using Lemon.ModuleNavigation.Core;
 
-namespace Lemon.ModuleNavigation.Abstractions
+namespace Lemon.ModuleNavigation.Abstractions;
+
+public interface IModuleNavigationService<T> : IModuleNavigationService where T : IModule
 {
-    public interface IModuleNavigationService<T> : IModuleNavigationService where T : IModule
-    {
-        IDisposable BindingNavigationHandler(IModuleNavigationHandler<T> handler);
-        void RequestModuleNavigate(T module, NavigationParameters parameters);
-    }
+    IDisposable BindingNavigationHandler(IModuleNavigationHandler<T> handler);
+    void RequestModuleNavigate(T module, NavigationParameters parameters);
 }
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IModuleScope.cs b/src/Lemon.ModuleNavigation/Abstractions/IModuleScope.cs
index 5e91e9d..3d70ce5 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IModuleScope.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IModuleScope.cs
@@ -1,10 +1,9 @@
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Lemon.ModuleNavigation.Abstractions
+namespace Lemon.ModuleNavigation.Abstractions;
+
+public interface IModuleScope
 {
-    public interface IModuleScope
-    {
-        IServiceCollection ScopeServiceCollection { get; }
-        IServiceProvider ScopeServiceProvider { get; }
-    }
+    IServiceCollection ScopeServiceCollection { get; }
+    IServiceProvider ScopeServiceProvider { get; }
 }
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IModuleServiceProvider.cs b/src/Lemon.ModuleNavigation/Abstractions/IModuleServiceProvider.cs
index 78612e4..26b4f88 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IModuleServiceProvider.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IModuleServiceProvider.cs
@@ -1,7 +1,6 @@
-namespace Lemon.ModuleNavigation.Abstractions
+namespace Lemon.ModuleNavigation.Abstractions;
+
+public interface IModuleServiceProvider : IServiceProvider
 {
-    public interface IModuleServiceProvider : IServiceProvider
-    {
 
-    }
 }
diff --git a/src/Lemon.ModuleNavigation/Abstractions/INavigationAware.cs b/src/Lemon.ModuleNavigation/Abstractions/INavigationAware.cs
index 6e64d75..23d0913 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/INavigationAware.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/INavigationAware.cs
@@ -1,11 +1,9 @@
-using Lemon.ModuleNavigation.Core;
+namespace Lemon.ModuleNavigation.Abstractions;
 
-namespace Lemon.ModuleNavigation.Abstractions
+public interface INavigationAware
 {
-    public interface INavigationAware
-    {
-        void OnNavigatedTo(NavigationContext navigationContext);
-        bool IsNavigationTarget(NavigationContext navigationContext);
-        void OnNavigatedFrom(NavigationContext navigationContext);
-    }
+    event Action? RequestUnload;
+    void OnNavigatedTo(NavigationContext navigationContext);
+    bool IsNavigationTarget(NavigationContext navigationContext);
+    void OnNavigatedFrom(NavigationContext navigationContext);
 }
diff --git a/src/Lemon.ModuleNavigation/Abstractions/INavigationHandler.cs b/src/Lemon.ModuleNavigation/Abstractions/INavigationHandler.cs
index 3cf7f6b..c360091 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/INavigationHandler.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/INavigationHandler.cs
@@ -1,10 +1,7 @@
-using System.Collections.ObjectModel;
+namespace Lemon.ModuleNavigation.Abstractions;
 
-namespace Lemon.ModuleNavigation.Abstractions
+public interface INavigationHandler : IModuleNavigationHandler<IModule>, IViewNavigationHandler
 {
-    public interface INavigationHandler : IModuleNavigationHandler<IModule>, IViewNavigationHandler
-    {
-        IRegionManager RegionManager { get; }
-        IModuleManager ModuleManager { get; }
-    }
+    IRegionManager RegionManager { get; }
+    IModuleManager ModuleManager { get; }
 }
diff --git a/src/Lemon.ModuleNavigation/Abstractions/INavigationService.cs b/src/Lemon.ModuleNavigation/Abstractions/INavigationService.cs
index 77b3526..36182a8 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/INavigationService.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/INavigationService.cs
@@ -1,7 +1,6 @@
-namespace Lemon.ModuleNavigation.Abstractions
+namespace Lemon.ModuleNavigation.Abstractions;
+
+public interface INavigationService: IModuleNavigationService<IModule>, IViewNavigationService
 {
-    public interface INavigationService: IModuleNavigationService<IModule>, IViewNavigationService
-    {
 
-    }
 }
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IRegion.cs b/src/Lemon.ModuleNavigation/Abstractions/IRegion.cs
index 73e9e1d..058557b 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IRegion.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IRegion.cs
@@ -1,19 +1,17 @@
-using Lemon.ModuleNavigation.Core;
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 
-namespace Lemon.ModuleNavigation.Abstractions
-{
-    public interface IRegion
-    {
-        string Name { get; }
-        ObservableCollection<NavigationContext> Contexts 
-        { 
-            get;
-        }
-        void Activate(NavigationContext target);
-        void DeActivate(NavigationContext target);
-        void DeActivate(string viewName);
+namespace Lemon.ModuleNavigation.Abstractions;
 
-        ///ongoing: last view
+public interface IRegion
+{
+    string Name { get; }
+    ObservableCollection<NavigationContext> Contexts 
+    { 
+        get;
     }
+    void Activate(NavigationContext target);
+    void DeActivate(NavigationContext target);
+    void DeActivate(string viewName);
+
+    ///ongoing: last view
 }
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs b/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs
index 5e52ea5..24f373a 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs
@@ -1,14 +1,12 @@
-
-using Lemon.ModuleNavigation.Core;
+using Lemon.ModuleNavigation.Core;
 
-namespace Lemon.ModuleNavigation.Abstractions
+namespace Lemon.ModuleNavigation.Abstractions;
+
+public interface IRegionManager: IObservable<NavigationContext>, IObservable<IRegion>
 {
-    public interface IRegionManager: IObservable<NavigationContext>, IObservable<IRegion>
-    {
-        void AddRegion(string regionName, IRegion region);
-        IRegion? GetRegion(string regionName);
-        void RequestNavigate(string regionName, string viewName, bool requestNae, NavigationParameters? parameters = null);
-        void RequestUnload(string regionName, string viewName);
-        void RequestUnload(NavigationContext context);
-    }
+    void AddRegion(string regionName, IRegion region);
+    IRegion? GetRegion(string regionName);
+    void RequestNavigate(string regionName, string viewName, bool requestNae, NavigationParameters? parameters = null);
+    void RequestUnload(string regionName, string viewName);
+    void RequestUnload(NavigationContext context);
 }
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IServiceAware.cs b/src/Lemon.ModuleNavigation/Abstractions/IServiceAware.cs
index 74df7ae..a3f6884 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IServiceAware.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IServiceAware.cs
@@ -1,7 +1,6 @@
-namespace Lemon.ModuleNavigation.Abstractions
+namespace Lemon.ModuleNavigation.Abstractions;
+
+public interface IServiceAware
 {
-    public interface IServiceAware
-    {
-        IServiceProvider ServiceProvider { get; }
-    }
+    IServiceProvider ServiceProvider { get; }
 }
diff --git a/src/Lemon.ModuleNavigation/Abstractions/ITabRegion{TDataTemplate}.cs b/src/Lemon.ModuleNavigation/Abstractions/ITabRegion{TDataTemplate}.cs
deleted file mode 100644
index 460ef90..0000000
--- a/src/Lemon.ModuleNavigation/Abstractions/ITabRegion{TDataTemplate}.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Lemon.ModuleNavigation.Abstractions;
-
-namespace Lemon.ModuleNavigation.Regions;
-
-public interface ITabRegion<TDataTemplate> : IRegion
-{
-    object? SelectedItem
-    {
-        get;
-        set;
-    }
-    TDataTemplate? RegionTemplate
-    {
-        get;
-        set;
-    }
-    void Add(object item);
-}
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationService.cs b/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationService.cs
index a9b86b9..51968f0 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationService.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationService.cs
@@ -5,13 +5,41 @@ namespace Lemon.ModuleNavigation.Abstractions;
 public interface IViewNavigationService
 {
     IDisposable BindingViewNavigationHandler(IViewNavigationHandler handler);
+    /// <summary>
+    /// RequestViewNavigation
+    /// </summary>
+    /// <param name="regionName"></param>
+    /// <param name="viewName"></param>
+    /// <param name="requestNew">
+    /// requestNew can not decide wether to get a new instance of View,
+    /// It is controlled by IsNavigationTarget() in INavigationAware.
+    /// We can handle the value of requestNew in IsNavigationTarget() by NavigationContext.
+    /// </param>
     void RequestViewNavigation(string regionName, 
         string viewName, 
         bool requestNew = false);
+
+    /// <summary>
+    /// RequestViewNavigation
+    /// </summary>
+    /// <param name="regionName"></param>
+    /// <param name="viewName"></param>
+    /// <param name="parameters"></param>
+    /// <param name="requestNew">
+    /// requestNew can not decide wether to get a new instance of View,
+    /// It is controlled by IsNavigationTarget() in INavigationAware.
+    /// We can handle the value of requestNew in IsNavigationTarget() by NavigationContext.
+    /// </param>
     void RequestViewNavigation(string regionName,
         string viewName,
         NavigationParameters parameters,
         bool requestNew = false);
+
+    /// <summary>
+    /// RequestViewUnload
+    /// </summary>
+    /// <param name="regionName"></param>
+    /// <param name="viewName"></param>
     void RequestViewUnload(string regionName,
        string viewName);
 }
diff --git a/src/Lemon.ModuleNavigation/Core/ButtonResult.cs b/src/Lemon.ModuleNavigation/Core/ButtonResult.cs
index b9e67b6..427835e 100644
--- a/src/Lemon.ModuleNavigation/Core/ButtonResult.cs
+++ b/src/Lemon.ModuleNavigation/Core/ButtonResult.cs
@@ -1,4 +1,4 @@
-namespace Lemon.ModuleNavigation.Dialogs;
+namespace Lemon.ModuleNavigation.Core;
 
 public enum ButtonResult
 {
diff --git a/src/Lemon.ModuleNavigation/Core/DialogParameters.cs b/src/Lemon.ModuleNavigation/Core/DialogParameters.cs
index c2828dc..421421c 100644
--- a/src/Lemon.ModuleNavigation/Core/DialogParameters.cs
+++ b/src/Lemon.ModuleNavigation/Core/DialogParameters.cs
@@ -1,9 +1,8 @@
 using Lemon.ModuleNavigation.Abstractions;
 
-namespace Lemon.ModuleNavigation.Dialogs
+namespace Lemon.ModuleNavigation.Core;
+
+public class DialogParameters : BaseParameters, IDialogParameters
 {
-    public class DialogParameters : BaseParameters, IDialogParameters
-    {
-        
-    }
+    
 }
diff --git a/src/Lemon.ModuleNavigation/Core/DialogResult.cs b/src/Lemon.ModuleNavigation/Core/DialogResult.cs
index fb28abd..dee5648 100644
--- a/src/Lemon.ModuleNavigation/Core/DialogResult.cs
+++ b/src/Lemon.ModuleNavigation/Core/DialogResult.cs
@@ -1,6 +1,6 @@
 using Lemon.ModuleNavigation.Abstractions;
 
-namespace Lemon.ModuleNavigation.Dialogs;
+namespace Lemon.ModuleNavigation.Core;
 
 /// <summary>
 /// An <see cref="IDialogResult"/> that contains <see cref="IDialogParameters"/> from the dialog
diff --git a/src/Lemon.ModuleNavigation/NavigationContext.cs b/src/Lemon.ModuleNavigation/NavigationContext.cs
index 2710905..f2f8b3f 100644
--- a/src/Lemon.ModuleNavigation/NavigationContext.cs
+++ b/src/Lemon.ModuleNavigation/NavigationContext.cs
@@ -11,7 +11,7 @@ internal NavigationContext(string viewName,
         bool requestNew,
         NavigationParameters? navigationParameters)
     {
-        TargetViewName = viewName;
+        ViewName = viewName;
         Parameters = navigationParameters;
         RequestNew = requestNew;
         RegionName = regionName;
@@ -20,7 +20,7 @@ internal NavigationContext(string viewName,
     }
     public static ViewNameComparer ViewNameComparer => new();
     public static StrictComparer StrictComparer => new();
-    public string TargetViewName 
+    public string ViewName 
     { 
         get; 
         private set; 
@@ -52,7 +52,7 @@ public IServiceProvider ServiceProvider
     }
     public override string ToString()
     {
-        return $"{RegionName}.{TargetViewName}";
+        return $"{RegionName}.{ViewName}";
     }
 }
 public class ViewNameComparer : IEqualityComparer<NavigationContext>
@@ -61,12 +61,12 @@ public bool Equals(NavigationContext? x, NavigationContext? y)
     {
         if (x == null && y == null) return true;
         if (x == null || y == null) return false;
-        return x.TargetViewName == y.TargetViewName;
+        return x.ViewName == y.ViewName;
     }
 
     public int GetHashCode(NavigationContext obj)
     {
-        return obj.TargetViewName.GetHashCode();
+        return obj.ViewName.GetHashCode();
     }
 }
 public class StrictComparer : IEqualityComparer<NavigationContext>

From ce72d92e5c20891e0ca875d640d5902d828acc25 Mon Sep 17 00:00:00 2001
From: Easley <nevermore.wd@me.com>
Date: Tue, 1 Apr 2025 18:51:34 +0800
Subject: [PATCH 07/15] avaloniaui namespace adjust

---
 .../DialogService.cs                          |  2 +-
 .../ModuleAs/ViewModelA.cs                    |  2 +-
 .../ModuleBs/ViewModelB.cs                    |  2 +-
 .../ModuleCs/ViewModelC.cs                    |  2 +-
 .../ModuleCs/ViewModels/SubViewModel01.cs     |  2 +-
 .../ModuleCs/ViewModels/SubViewModel02.cs     |  2 +-
 .../ViewModels/MainViewModel.cs               |  2 +-
 .../ViewModels/SampleViewModelBase.cs         | 23 +++++++++++++++++--
 .../ViewModels/ViewAlphaViewModel.cs          |  4 +---
 .../ViewModels/ViewBetaViewModel.cs           |  4 +---
 10 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/DialogService.cs b/src/Lemon.ModuleNavigation.Avaloniaui/DialogService.cs
index 8768985..6d527dd 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/DialogService.cs
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/DialogService.cs
@@ -1,7 +1,7 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Lemon.ModuleNavigation.Abstractions;
-using Lemon.ModuleNavigation.Dialogs;
+using Lemon.ModuleNavigation.Core;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Lemon.ModuleNavigation.Avaloniaui;
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleAs/ViewModelA.cs b/src/Lemon.ModuleNavigation.Sample/ModuleAs/ViewModelA.cs
index 46305a9..08513b2 100644
--- a/src/Lemon.ModuleNavigation.Sample/ModuleAs/ViewModelA.cs
+++ b/src/Lemon.ModuleNavigation.Sample/ModuleAs/ViewModelA.cs
@@ -5,7 +5,7 @@
 
 namespace Lemon.ModuleNavigation.Sample.ModuleAs;
 
-public class ViewModelA : SampleViewModelBase, IModuleNavigationAware
+public class ViewModelA : BaseNavigationViewModel, IModuleNavigationAware
 {
     private readonly NavigationService _navigationService;
     public ViewModelA(NavigationService navigationService)
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleBs/ViewModelB.cs b/src/Lemon.ModuleNavigation.Sample/ModuleBs/ViewModelB.cs
index 7d1a96c..ca58f6a 100644
--- a/src/Lemon.ModuleNavigation.Sample/ModuleBs/ViewModelB.cs
+++ b/src/Lemon.ModuleNavigation.Sample/ModuleBs/ViewModelB.cs
@@ -5,7 +5,7 @@
 
 namespace Lemon.ModuleNavigation.Sample.ModuleBs;
 
-public class ViewModelB : SampleViewModelBase, IModuleNavigationAware
+public class ViewModelB : BaseNavigationViewModel, IModuleNavigationAware
 {
     private readonly NavigationService _navigationService;
     public ViewModelB(NavigationService navigationService)
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModelC.cs b/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModelC.cs
index accbfb9..a66c653 100644
--- a/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModelC.cs
+++ b/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModelC.cs
@@ -6,7 +6,7 @@
 
 namespace Lemon.ModuleNavigation.Sample.ModuleCs
 {
-    public class ViewModelC : SampleViewModelBase, IModuleNavigationAware, IServiceAware
+    public class ViewModelC : BaseNavigationViewModel, IModuleNavigationAware, IServiceAware
     {
         private readonly IModuleNavigationService<IModule> _navigationService;
         private readonly IServiceProvider _moduleServiceProvider;
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel01.cs b/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel01.cs
index 60d7fb1..07e14c0 100644
--- a/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel01.cs
+++ b/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel01.cs
@@ -6,7 +6,7 @@
 
 namespace Lemon.ModuleNavigation.Sample.ModuleCs.ViewModels;
 
-public class SubViewModel01 : SampleViewModelBase, IModuleNavigationAware
+public class SubViewModel01 : BaseNavigationViewModel, IModuleNavigationAware
 {
     private readonly ILogger _logger;
     public SubViewModel01(IServiceProvider serviceProvider, IServiceProviderDecorator appServiceProvider)
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel02.cs b/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel02.cs
index ce32cef..309c335 100644
--- a/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel02.cs
+++ b/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel02.cs
@@ -4,7 +4,7 @@
 
 namespace Lemon.ModuleNavigation.Sample.ModuleCs.ViewModels;
 
-public class SubViewModel02 : SampleViewModelBase, IModuleNavigationAware
+public class SubViewModel02 : BaseNavigationViewModel, IModuleNavigationAware
 {
     public SubViewModel02(IServiceProvider serviceProvider)
     {
diff --git a/src/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs b/src/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
index da0c666..41c1dc5 100644
--- a/src/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
+++ b/src/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
@@ -11,7 +11,7 @@
 
 namespace Lemon.ModuleNavigation.Sample.ViewModels;
 
-public class MainViewModel : SampleViewModelBase, IServiceAware
+public class MainViewModel : BaseNavigationViewModel, IServiceAware
 {
     private readonly NavigationService _navigationService;
     private readonly IServiceProvider _serviceProvider;
diff --git a/src/Lemon.ModuleNavigation.Sample/ViewModels/SampleViewModelBase.cs b/src/Lemon.ModuleNavigation.Sample/ViewModels/SampleViewModelBase.cs
index 1fd699c..b737304 100644
--- a/src/Lemon.ModuleNavigation.Sample/ViewModels/SampleViewModelBase.cs
+++ b/src/Lemon.ModuleNavigation.Sample/ViewModels/SampleViewModelBase.cs
@@ -1,13 +1,32 @@
-using ReactiveUI;
+using Lemon.ModuleNavigation.Abstractions;
+using ReactiveUI;
 using System;
 
 namespace Lemon.ModuleNavigation.Sample.ViewModels;
 
-public class SampleViewModelBase : ReactiveObject, IDisposable
+public class BaseNavigationViewModel : ReactiveObject, INavigationAware, IDisposable
 {
     public virtual string Greeting => $"Welcome to {GetType().Name}[{Environment.ProcessId}][{Environment.CurrentManagedThreadId}]{Environment.NewLine}{DateTime.Now:yyyy-MM-dd HH-mm-ss.ffff}";
+
+    public event Action? RequestUnload;
+
     public virtual void Dispose()
     {
         
     }
+
+    public virtual bool IsNavigationTarget(NavigationContext navigationContext)
+    {
+        return !navigationContext.RequestNew;
+    }
+
+    public virtual void OnNavigatedFrom(NavigationContext navigationContext)
+    {
+       
+    }
+
+    public virtual void OnNavigatedTo(NavigationContext navigationContext)
+    {
+        
+    }
 }
diff --git a/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewAlphaViewModel.cs b/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewAlphaViewModel.cs
index 655941e..f393aa8 100644
--- a/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewAlphaViewModel.cs
+++ b/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewAlphaViewModel.cs
@@ -7,9 +7,7 @@
 
 namespace Lemon.ModuleNavigation.Sample.ViewModels
 {
-    public class ViewAlphaViewModel : SampleViewModelBase, 
-        IDialogAware, 
-        INavigationAware
+    public class ViewAlphaViewModel : BaseNavigationViewModel, IDialogAware
     {
         private readonly ILogger _logger;
         public ViewAlphaViewModel(ILogger<ViewAlphaViewModel> logger)
diff --git a/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewBetaViewModel.cs b/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewBetaViewModel.cs
index f88035a..28812e1 100644
--- a/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewBetaViewModel.cs
+++ b/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewBetaViewModel.cs
@@ -7,9 +7,7 @@
 
 namespace Lemon.ModuleNavigation.Sample.ViewModels;
 
-public class ViewBetaViewModel : SampleViewModelBase,
-    IDialogAware,
-    INavigationAware
+public class ViewBetaViewModel : BaseNavigationViewModel, IDialogAware
 {
     private readonly ILogger _logger;
     public ViewBetaViewModel(ILogger<ViewBetaViewModel> logger)

From 375d8f50bede8e5ce90c38ad9cae6204c5c24e25 Mon Sep 17 00:00:00 2001
From: Easley <nevermore.wd@me.com>
Date: Tue, 1 Apr 2025 18:52:10 +0800
Subject: [PATCH 08/15] rename

---
 .../{SampleViewModelBase.cs => BaseNavigationViewModel.cs}        | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/Lemon.ModuleNavigation.Sample/ViewModels/{SampleViewModelBase.cs => BaseNavigationViewModel.cs} (100%)

diff --git a/src/Lemon.ModuleNavigation.Sample/ViewModels/SampleViewModelBase.cs b/src/Lemon.ModuleNavigation.Sample/ViewModels/BaseNavigationViewModel.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/ViewModels/SampleViewModelBase.cs
rename to src/Lemon.ModuleNavigation.Sample/ViewModels/BaseNavigationViewModel.cs

From c9052797b13e95bfa6743d8a09dca67f125871e8 Mon Sep 17 00:00:00 2001
From: Easley <nevermore.wd@me.com>
Date: Tue, 1 Apr 2025 18:53:08 +0800
Subject: [PATCH 09/15] exclude bin

---
 .../Lemon.ModuleNavigation.Wpf.csproj                       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Lemon.ModuleNavigation.Wpf/Lemon.ModuleNavigation.Wpf.csproj b/src/Lemon.ModuleNavigation.Wpf/Lemon.ModuleNavigation.Wpf.csproj
index 7b630ea..d773758 100644
--- a/src/Lemon.ModuleNavigation.Wpf/Lemon.ModuleNavigation.Wpf.csproj
+++ b/src/Lemon.ModuleNavigation.Wpf/Lemon.ModuleNavigation.Wpf.csproj
@@ -13,6 +13,12 @@
 	<PackageReadmeFile>README.md</PackageReadmeFile>
 	<BaseOutputPath>../output</BaseOutputPath>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="bin\**" />
+    <EmbeddedResource Remove="bin\**" />
+    <None Remove="bin\**" />
+    <Page Remove="bin\**" />
+  </ItemGroup>
   <ItemGroup>
     <None Include="..\..\README.md">
       <Pack>True</Pack>

From 239533c88ddfa60f627f8d3ec0aa2d52c6f507d6 Mon Sep 17 00:00:00 2001
From: Easley <nevermore.wd@me.com>
Date: Tue, 1 Apr 2025 18:56:54 +0800
Subject: [PATCH 10/15] update breakdownchanges

---
 src/breakdownchanges.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/breakdownchanges.md b/src/breakdownchanges.md
index cae9604..3cf7648 100644
--- a/src/breakdownchanges.md
+++ b/src/breakdownchanges.md
@@ -1,5 +1,7 @@
-remove namespaces:
-Lemon.ModuleNavigation.Avaloniaui.Extensions;
+### remove namespaces:
+- Lemon.ModuleNavigation.Avaloniaui.Extensions;
+- Lemon.ModuleNavigation.Avaloniaui.Dialogs; 
+  original members were pulled to Lemon.ModuleNavigation.Avaloniaui.Core；
 
-rename namespaces:
-Lemon.ModuleNavigation.Abstracts to Lemon.ModuleNavigation.Abstractions;
\ No newline at end of file
+### rename namespaces:
+- Lemon.ModuleNavigation.Abstracts to Lemon.ModuleNavigation.Abstractions;
\ No newline at end of file

From 5b651c973fc3e899fd4dbca6409acec1d10cdc3b Mon Sep 17 00:00:00 2001
From: Easley <nevermore.wd@me.com>
Date: Wed, 2 Apr 2025 15:43:24 +0800
Subject: [PATCH 11/15] remove requestNew;wpf ok

---
 .../Regions/ContentRegion.cs                  | 64 ++++++---------
 .../Regions/ItemsRegion.cs                    | 78 ++++++-------------
 .../Regions/Region.cs                         | 57 ++++++++++----
 .../Regions/TabRegion.cs                      | 10 +--
 .../MainWindowViewModel.cs                    | 13 ++--
 .../ViewModels/ViewAlphaViewModel.cs          |  9 ++-
 .../ViewModels/ViewBetaViewModel.cs           |  9 ++-
 .../Views/ViewAlpha.xaml                      |  1 +
 .../Views/ViewBeta.xaml                       |  1 +
 .../Abstractions/IRegionManager.cs            |  4 +-
 .../Abstractions/IViewNavigationHandler.cs    |  6 +-
 .../Abstractions/IViewNavigationService.cs    | 17 ++--
 .../NavigationContext.cs                      | 29 ++++---
 .../NavigationHandler.cs                      | 10 +--
 .../NavigationService.cs                      | 41 +++++++---
 src/Lemon.ModuleNavigation/RegionManager.cs   | 25 ++++++
 16 files changed, 214 insertions(+), 160 deletions(-)

diff --git a/src/Lemon.ModuleNavigation.Wpf/Regions/ContentRegion.cs b/src/Lemon.ModuleNavigation.Wpf/Regions/ContentRegion.cs
index 6c83f51..86040fc 100644
--- a/src/Lemon.ModuleNavigation.Wpf/Regions/ContentRegion.cs
+++ b/src/Lemon.ModuleNavigation.Wpf/Regions/ContentRegion.cs
@@ -1,5 +1,4 @@
 using Lemon.ModuleNavigation.Abstractions;
-using Microsoft.Extensions.DependencyInjection;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using System.Windows;
@@ -42,10 +41,30 @@ public DataTemplate? ContentTemplate
 
     public event PropertyChangedEventHandler? PropertyChanged;
 
+    /// <summary>
+    /// When Views with same ViewName were found, the latest one will be picked.
+    /// </summary>
+    /// <param name="target"></param>
     public override void Activate(NavigationContext target)
     {
-        Content = target;
-        Contexts.Add(target);
+        if (ViewCache.TryGetValue(target, out IView? accurateView))
+        {
+            target.View = accurateView;
+            Content = target;
+        }
+        else if (ViewNameCache.TryGetValue(target.ViewName, out IView? view)
+            && view.DataContext is INavigationAware navigationAware
+            && navigationAware.IsNavigationTarget(target))
+        {
+            var context = Contexts.First(c => c.ViewName == target.ViewName);
+            context.View = view;
+            Content = context;
+        }
+        else
+        {
+            Contexts.Add(target);
+            Content = target;
+        }
     }
 
     public override void DeActivate(string regionName)
@@ -70,45 +89,10 @@ public override void DeActivate(NavigationContext navigationContext)
             }
         }
     }
-
-    protected override IView? ResolveView(NavigationContext context)
-    {
-        bool needNewView = !ViewNameCache.TryGetValue(context.ViewName, out IView? view);
-
-        if (!needNewView)
-        {
-            if (view!.DataContext is INavigationAware navigationAware
-                && !navigationAware.IsNavigationTarget(context))
-            {
-                needNewView = true;
-            }
-        }
-
-        if (needNewView)
-        {
-            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);
-            navigationAware.RequestUnload += () =>
-            {
-                DeActivate(context);
-            };
-            Current.SetData((view, navigationAware));
-            ViewNameCache[context.ViewName] = view;
-        }
-
-        return view;
-    }
+    
     protected virtual void SetBindingContentTemplate()
     {
-        ContentTemplate = RegionTemplate;
+        ContentTemplate = RegionContentTemplate;
         BindingOperations.SetBinding(_contentControl,
             ContentControl.ContentTemplateProperty,
             new Binding
diff --git a/src/Lemon.ModuleNavigation.Wpf/Regions/ItemsRegion.cs b/src/Lemon.ModuleNavigation.Wpf/Regions/ItemsRegion.cs
index e1b4602..4ddaf57 100644
--- a/src/Lemon.ModuleNavigation.Wpf/Regions/ItemsRegion.cs
+++ b/src/Lemon.ModuleNavigation.Wpf/Regions/ItemsRegion.cs
@@ -1,5 +1,4 @@
 using Lemon.ModuleNavigation.Abstractions;
-using Microsoft.Extensions.DependencyInjection;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using System.Windows;
@@ -53,34 +52,37 @@ public override void ScrollIntoView(NavigationContext item)
     {
         _itemsControl.ScrollIntoView(item);
     }
+
+    /// <summary>
+    /// When Views with same ViewName were found, the earliest one will be picked.
+    /// </summary>
+    /// <param name="target"></param>
     public override void Activate(NavigationContext target)
     {
-        if (!target.RequestNew)
+        try
         {
-            var targetContext = Contexts.FirstOrDefault(context =>
-            {
-                if (NavigationContext.ViewNameComparer.Equals(target, context))
-                {
-                    return true;
-                }
-                return false;
-            });
-            if (targetContext == null)
+            if (ViewCache.TryGetValue(target, out IView? accurateView))
             {
-                Contexts.Add(target);
+                target.View = accurateView;
                 SelectedItem = target;
+                return;
             }
-            else
+            var context = Contexts.FirstOrDefault(c => c.ViewName == target.ViewName);
+            if (context is not null
+                && context.View is not null
+                && context.View.DataContext is INavigationAware navigationAware
+                && navigationAware.IsNavigationTarget(target))
             {
-                SelectedItem = targetContext;
+                SelectedItem = context;
+                return;
             }
-        }
-        else
-        {
             Contexts.Add(target);
             SelectedItem = target;
         }
-        ScrollIntoView((SelectedItem as NavigationContext)!);
+        finally
+        {
+            ScrollIntoView((SelectedItem as NavigationContext)!);
+        }
     }
     public override void DeActivate(string viewName)
     {
@@ -93,43 +95,7 @@ public override void DeActivate(NavigationContext navigationContext)
     public void Add(NavigationContext item)
     {
         Contexts.Add(item);
-    }
-
-    protected override IView? ResolveView(NavigationContext context)
-    {
-        bool needNewView = !ViewCache.TryGetValue(context.Guid, out IView? view);
-
-        if (!needNewView)
-        {
-            if (view!.DataContext is INavigationAware navigationAware
-                && !navigationAware.IsNavigationTarget(context))
-            {
-                needNewView = true;
-            }
-        }
-
-        if (needNewView)
-        {
-            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);
-            navigationAware.RequestUnload += () =>
-            {
-                DeActivate(context);
-            };
-            Current.SetData((view, navigationAware));
-            ViewCache[context.Guid] = view;
-        }
-
-        return view;
-    }
+    }   
 
     protected virtual void SetBindingItemsSource()
     {
@@ -141,7 +107,7 @@ protected virtual void SetBindingItemsSource()
     }
     protected virtual void SetBindingItemTemplate()
     {
-        ItemTemplate = RegionTemplate;
+        ItemTemplate = RegionContentTemplate;
         BindingOperations.SetBinding(_itemsControl, ItemsControl.ItemTemplateProperty, new Binding
         {
             Source = this,
diff --git a/src/Lemon.ModuleNavigation.Wpf/Regions/Region.cs b/src/Lemon.ModuleNavigation.Wpf/Regions/Region.cs
index de66db9..5948264 100644
--- a/src/Lemon.ModuleNavigation.Wpf/Regions/Region.cs
+++ b/src/Lemon.ModuleNavigation.Wpf/Regions/Region.cs
@@ -1,5 +1,6 @@
 using Lemon.ModuleNavigation.Abstractions;
 using Lemon.ModuleNavigation.Core;
+using Microsoft.Extensions.DependencyInjection;
 using System.Collections.Concurrent;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
@@ -15,39 +16,43 @@ public Region(string name)
         Name = name;
         Current = new();
         ViewCache = [];
-        ViewNameCache = [];
         Contexts = [];
-        RegionTemplate = CreateRegionDataTemplate();
+        RegionContentTemplate = CreateRegionDataTemplate();
         Contexts.CollectionChanged += Contexts_CollectionChanged;
     }
-
-    protected ConcurrentDictionary<Guid, IView> ViewCache
+    protected ConcurrentItem<(IView View, INavigationAware NavigationAware)> Current
     {
         get;
     }
-    protected ConcurrentDictionary<string, IView> ViewNameCache
+    public string Name
     {
         get;
     }
-    protected ConcurrentItem<(IView View, INavigationAware NavigationAware)> Current
+    protected ConcurrentDictionary<NavigationContext, IView> ViewCache
     {
         get;
     }
-    public string Name
+
+    protected ConcurrentDictionary<string, IView> ViewNameCache
     {
-        get;
+        get
+        {
+            return new(Contexts
+                    .GroupBy(kv => kv.ViewName)
+                    .Select(group => new KeyValuePair<string, IView>(
+                        group.Key,
+                        group.Last().View!)));
+        }
     }
-
     public ObservableCollection<NavigationContext> Contexts
     {
         get;
     }
 
-    public DataTemplate? RegionTemplate
+    public DataTemplate? RegionContentTemplate
     {
         get;
     }
-
     public virtual void ScrollIntoView(int index)
     {
         throw new NotImplementedException();
@@ -60,7 +65,31 @@ public virtual void ScrollIntoView(NavigationContext item)
     public abstract void DeActivate(string viewName);
     public abstract void DeActivate(NavigationContext target);
 
-    protected abstract IView? ResolveView(NavigationContext context);
+    protected IView? ResolveView(NavigationContext context)
+    {
+        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);
+            navigationAware.RequestUnload += () =>
+            {
+                DeActivate(context);
+            };
+            Current.SetData((view, navigationAware));
+            context.View = view;
+            ViewCache.AddOrUpdate(context, view, (key, value) => view);
+        }
+        return view;
+    }
 
     protected virtual void WhenContextsAdded(IEnumerable<NavigationContext> contexts)
     {
@@ -111,9 +140,7 @@ public NavigationContextToViewConverter(Region region)
         {
             if (value is NavigationContext context)
             {
-                var view = _region.ResolveView(context);
-                _region.ViewCache.AddOrUpdate(context.Guid, view!, (key, oldValue) => view!);
-                return view;
+                return _region.ResolveView(context);
             }
             return null;
         }
diff --git a/src/Lemon.ModuleNavigation.Wpf/Regions/TabRegion.cs b/src/Lemon.ModuleNavigation.Wpf/Regions/TabRegion.cs
index 59232db..bd2e072 100644
--- a/src/Lemon.ModuleNavigation.Wpf/Regions/TabRegion.cs
+++ b/src/Lemon.ModuleNavigation.Wpf/Regions/TabRegion.cs
@@ -11,13 +11,14 @@ public class TabRegion : ItemsRegion, IContentRegionContext<DataTemplate>
     public TabRegion(string name, TabControl tabControl) : base(name, tabControl)
     {
         _tabControl = tabControl;
-        ContentTemplate = RegionTemplate;
+        ContentTemplate = RegionContentTemplate;
         SetBindingContentTemplate();
     }
+
     public object? Content
     {
-        get;
-        set;
+        get => throw new NotImplementedException();
+        set => throw new NotImplementedException();
     }
 
     private DataTemplate? _contentTemplate;
@@ -32,9 +33,8 @@ public DataTemplate? ContentTemplate
     }
     protected override void SetBindingItemTemplate()
     {
-        //
+        //base.SetBindingItemTemplate();
     }
-
     protected virtual void SetBindingContentTemplate()
     {
         BindingOperations.SetBinding(_tabControl,
diff --git a/src/Lemon.ModuleNavigation.WpfSample/MainWindowViewModel.cs b/src/Lemon.ModuleNavigation.WpfSample/MainWindowViewModel.cs
index 6d9ea8f..987bd8e 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/MainWindowViewModel.cs
+++ b/src/Lemon.ModuleNavigation.WpfSample/MainWindowViewModel.cs
@@ -11,7 +11,7 @@ public class MainWindowViewModel : ReactiveObject, IServiceAware
     private readonly INavigationService _navigationService;
     private readonly IDialogService _dialogService;
     private readonly IRegionManager _regionManager;
-    public MainWindowViewModel(INavigationService navigationService, 
+    public MainWindowViewModel(INavigationService navigationService,
         IDialogService dialogService,
         IRegionManager regionManager,
         IServiceProvider serviceProvider)
@@ -19,9 +19,9 @@ public MainWindowViewModel(INavigationService navigationService,
         _dialogService = dialogService;
         _regionManager = regionManager;
         _navigationService = navigationService;
-        _navigationService.RequestViewNavigation("ContentRegion", "ViewAlpha", false);
+        _navigationService.RequestViewNavigation("ContentRegion", "ViewAlpha");
         ServiceProvider = serviceProvider;
-        NavigateToViewCommand = ReactiveCommand.Create<string>(content => 
+        NavigateToViewCommand = ReactiveCommand.Create<string>(content =>
         {
             var viewName = content;
             var requestNew = false;
@@ -31,9 +31,9 @@ public MainWindowViewModel(INavigationService navigationService,
                 requestNew = true;
 
             }
-            _navigationService.RequestViewNavigation("ContentRegion", viewName, new NavigationParameters { { "requestNew", requestNew } }, requestNew);
-            _navigationService.RequestViewNavigation("TabRegion", viewName, new NavigationParameters { { "requestNew", requestNew } }, requestNew);
-            _navigationService.RequestViewNavigation("ItemsRegion", viewName, new NavigationParameters { { "requestNew", requestNew } }, requestNew);
+            _navigationService.RequestViewNavigation("ContentRegion", viewName, new NavigationParameters { { "requestNew", requestNew } });
+            _navigationService.RequestViewNavigation("TabRegion", viewName, new NavigationParameters { { "requestNew", requestNew } });
+            _navigationService.RequestViewNavigation("ItemsRegion", viewName, new NavigationParameters { { "requestNew", requestNew } });
         });
 
         ShowCommand = ReactiveCommand.Create<string>(content =>
@@ -84,7 +84,6 @@ await _dialogService.ShowDialog(content,
         {
             _regionManager.RequestUnload(context);
         });
-
     }
 
     public IServiceProvider ServiceProvider
diff --git a/src/Lemon.ModuleNavigation.WpfSample/ViewModels/ViewAlphaViewModel.cs b/src/Lemon.ModuleNavigation.WpfSample/ViewModels/ViewAlphaViewModel.cs
index fb30065..b34a2ed 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/ViewModels/ViewAlphaViewModel.cs
+++ b/src/Lemon.ModuleNavigation.WpfSample/ViewModels/ViewAlphaViewModel.cs
@@ -45,6 +45,13 @@ public void OnDialogOpened(IDialogParameters? parameters)
 
     public override bool IsNavigationTarget(NavigationContext navigationContext)
     {
-        return !navigationContext.RequestNew;
+        if (navigationContext.Parameters is not null)
+        {
+            if (navigationContext.Parameters.TryGetValue("requestNew", out bool requestNew))
+            {
+                return !requestNew;
+            }
+        }
+        return true;
     }
 }
diff --git a/src/Lemon.ModuleNavigation.WpfSample/ViewModels/ViewBetaViewModel.cs b/src/Lemon.ModuleNavigation.WpfSample/ViewModels/ViewBetaViewModel.cs
index df5088a..dd126a3 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/ViewModels/ViewBetaViewModel.cs
+++ b/src/Lemon.ModuleNavigation.WpfSample/ViewModels/ViewBetaViewModel.cs
@@ -40,6 +40,13 @@ public void OnDialogOpened(IDialogParameters? parameters)
     }
     public override bool IsNavigationTarget(NavigationContext navigationContext)
     {
-        return !navigationContext.RequestNew;
+        if (navigationContext.Parameters is not null)
+        {
+            if (navigationContext.Parameters.TryGetValue("requestNew", out bool requestNew))
+            {
+                return !requestNew;
+            }
+        }
+        return true;
     }
 }
diff --git a/src/Lemon.ModuleNavigation.WpfSample/Views/ViewAlpha.xaml b/src/Lemon.ModuleNavigation.WpfSample/Views/ViewAlpha.xaml
index 3421ddb..5034d9f 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/Views/ViewAlpha.xaml
+++ b/src/Lemon.ModuleNavigation.WpfSample/Views/ViewAlpha.xaml
@@ -16,6 +16,7 @@
     <Border
         Background="IndianRed"
         BorderBrush="LemonChiffon"
+        HorizontalAlignment="Stretch"
         BorderThickness="1">
         <StackPanel>
             <TextBlock Text="{Binding Greeting}" />
diff --git a/src/Lemon.ModuleNavigation.WpfSample/Views/ViewBeta.xaml b/src/Lemon.ModuleNavigation.WpfSample/Views/ViewBeta.xaml
index 4041af2..45da567 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/Views/ViewBeta.xaml
+++ b/src/Lemon.ModuleNavigation.WpfSample/Views/ViewBeta.xaml
@@ -14,6 +14,7 @@
         <default:BoolToVisibilityConverter x:Key="BoolToVisibilityConverterInverse" Inverse="True" />
     </UserControl.Resources>
     <Border
+        HorizontalAlignment="Stretch"
         Background="CadetBlue"
         BorderBrush="LemonChiffon"
         BorderThickness="1">
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs b/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs
index 24f373a..b6d7df3 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs
@@ -6,7 +6,9 @@ public interface IRegionManager: IObservable<NavigationContext>, IObservable<IRe
 {
     void AddRegion(string regionName, IRegion region);
     IRegion? GetRegion(string regionName);
-    void RequestNavigate(string regionName, string viewName, bool requestNae, NavigationParameters? parameters = null);
+    void RequestNavigate(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 RequestUnload(string regionName, string viewName);
     void RequestUnload(NavigationContext context);
 }
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationHandler.cs b/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationHandler.cs
index 9efd18d..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, 
-        bool requestNew);
+        string viewName);
     void OnNavigateTo(string regionName, 
         string viewName,
-        NavigationParameters parameters,
-        bool requestNew);
+        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 51968f0..c05cafd 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationService.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IViewNavigationService.cs
@@ -13,11 +13,14 @@ public interface IViewNavigationService
     /// <param name="requestNew">
     /// requestNew can not decide wether to get a new instance of View,
     /// It is controlled by IsNavigationTarget() in INavigationAware.
-    /// We can handle the value of requestNew in IsNavigationTarget() by NavigationContext.
     /// </param>
+    [Obsolete("requestNew was obsolete.Consider IsNavigationTarget() in INavigationAware instead.")]
     void RequestViewNavigation(string regionName, 
-        string viewName, 
-        bool requestNew = false);
+        string viewName,
+        bool requestNew);
+
+    void RequestViewNavigation(string regionName,
+        string viewName);
 
     /// <summary>
     /// RequestViewNavigation
@@ -28,12 +31,16 @@ void RequestViewNavigation(string regionName,
     /// <param name="requestNew">
     /// requestNew can not decide wether to get a new instance of View,
     /// It is controlled by IsNavigationTarget() in INavigationAware.
-    /// We can handle the value of requestNew in IsNavigationTarget() by NavigationContext.
     /// </param>
+    [Obsolete("requestNew was obsolete.Consider IsNavigationTarget() in INavigationAware instead.")]
     void RequestViewNavigation(string regionName,
         string viewName,
         NavigationParameters parameters,
-        bool requestNew = false);
+        bool requestNew);
+
+    void RequestViewNavigation(string regionName,
+        string viewName,
+        NavigationParameters parameters);
 
     /// <summary>
     /// RequestViewUnload
diff --git a/src/Lemon.ModuleNavigation/NavigationContext.cs b/src/Lemon.ModuleNavigation/NavigationContext.cs
index f2f8b3f..8f1eced 100644
--- a/src/Lemon.ModuleNavigation/NavigationContext.cs
+++ b/src/Lemon.ModuleNavigation/NavigationContext.cs
@@ -1,10 +1,11 @@
-using Lemon.ModuleNavigation.Core;
+using Lemon.ModuleNavigation.Abstractions;
+using Lemon.ModuleNavigation.Core;
 
 namespace Lemon.ModuleNavigation;
 
 public class NavigationContext
 {
-    private readonly Guid _guid;
+    [Obsolete("requestNew was obsolete.Consider IsNavigationTarget() in INavigationAware instead.")]
     internal NavigationContext(string viewName, 
         string regionName,
         IServiceProvider serviceProvider,
@@ -15,7 +16,16 @@ internal NavigationContext(string viewName,
         Parameters = navigationParameters;
         RequestNew = requestNew;
         RegionName = regionName;
-        _guid = Guid.NewGuid();
+        ServiceProvider = serviceProvider;
+    }
+    internal NavigationContext(string viewName,
+        string regionName,
+        IServiceProvider serviceProvider,
+        NavigationParameters? navigationParameters)
+    {
+        ViewName = viewName;
+        Parameters = navigationParameters;
+        RegionName = regionName;
         ServiceProvider = serviceProvider;
     }
     public static ViewNameComparer ViewNameComparer => new();
@@ -30,6 +40,7 @@ public NavigationParameters? Parameters
         get; 
         private set; 
     }
+    [Obsolete("requestNew was obsolete.Consider IsNavigationTarget() in INavigationAware instead.")]
     public bool RequestNew
     {
         get;
@@ -40,15 +51,15 @@ public string RegionName
         get; 
         private set; 
     }
-    public Uri? Uri
+    public int Key => GetHashCode();
+    public IServiceProvider ServiceProvider
     {
         get;
-        set;
     }
-    public Guid Guid => _guid;
-    public IServiceProvider ServiceProvider
+    public IView? View
     {
         get;
+        set;
     }
     public override string ToString()
     {
@@ -75,11 +86,11 @@ public bool Equals(NavigationContext? x, NavigationContext? y)
     {
         if (x == null && y == null) return true;
         if (x == null || y == null) return false;
-        return x.Guid == y.Guid;
+        return x.Key == y.Key;
     }
 
     public int GetHashCode(NavigationContext obj)
     {
-        return obj.Guid.GetHashCode();
+        return obj.Key.GetHashCode();
     }
 }
diff --git a/src/Lemon.ModuleNavigation/NavigationHandler.cs b/src/Lemon.ModuleNavigation/NavigationHandler.cs
index cb9d6ab..3a4bba3 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,
-         bool requestNew = false)
+         string viewName)
     {
-        RegionManager.RequestNavigate(regionName, viewName, requestNew, null);
+        RegionManager.RequestNavigate(regionName, viewName, null);
     }
     public void OnNavigateTo(string regionName,
         string viewName,
-        NavigationParameters navigationParameters,
-        bool requestNew = false)
+        NavigationParameters navigationParameters)
     {
-        RegionManager.RequestNavigate(regionName, viewName, requestNew, navigationParameters);
+        RegionManager.RequestNavigate(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 959bfb5..386824e 100644
--- a/src/Lemon.ModuleNavigation/NavigationService.cs
+++ b/src/Lemon.ModuleNavigation/NavigationService.cs
@@ -13,7 +13,7 @@ public class NavigationService : INavigationService
     // reserve only one for now.
     private readonly ConcurrentStack<(IModule module, NavigationParameters parameter)> _bufferModule = [];
     private readonly ConcurrentStack<(string moduleName, NavigationParameters parameter)> _bufferModuleName = [];
-    private readonly ConcurrentStack<(string regionName, string viewName, NavigationParameters? parameter, bool requestNew)> _bufferViewName = [];
+    private readonly ConcurrentStack<(string regionName, string viewName, NavigationParameters? parameter)> _bufferViewName = [];
 
     public NavigationService()
     {
@@ -39,26 +39,47 @@ public void RequestModuleNavigate(string moduleName, NavigationParameters parame
         }
         _bufferModuleName.Push((moduleName, parameters));
     }
+    public void RequestViewNavigation(string regionName,
+       string viewName)
+    {
+        foreach (var handler in _viewHandlers)
+        {
+            handler.OnNavigateTo(regionName, viewName);
+        }
+        _bufferViewName.Push((regionName, viewName, null));
+    }
+    public void RequestViewNavigation(string regionName,
+        string viewName,
+        NavigationParameters parameters)
+    {
+        foreach (var handler in _viewHandlers)
+        {
+            handler.OnNavigateTo(regionName, viewName, parameters);
+        }
+        _bufferViewName.Push((regionName, viewName, parameters));
+    }
+    [Obsolete("requestNew was obsolete.Consider IsNavigationTarget() in INavigationAware instead.")]
     public void RequestViewNavigation(string regionName,
         string viewName,
-        bool requestNew = false)
+        bool requestNew)
     {
         foreach (var handler in _viewHandlers)
         {
-            handler.OnNavigateTo(regionName, viewName, requestNew);
+            handler.OnNavigateTo(regionName, viewName);
         }
-        _bufferViewName.Push((regionName, viewName, null, requestNew));
+        _bufferViewName.Push((regionName, viewName, null));
     }
+    [Obsolete("requestNew was obsolete.Consider IsNavigationTarget() in INavigationAware instead.")]
     public void RequestViewNavigation(string regionName,
         string viewName,
         NavigationParameters parameters,
-        bool requestNew = false)
+        bool requestNew)
     {
         foreach (var handler in _viewHandlers)
         {
-            handler.OnNavigateTo(regionName, viewName, parameters, requestNew);
+            handler.OnNavigateTo(regionName, viewName, parameters);
         }
-        _bufferViewName.Push((regionName, viewName, parameters, requestNew));
+        _bufferViewName.Push((regionName, viewName, parameters));
     }
 
     public void RequestViewUnload(string regionName, string viewName)
@@ -99,15 +120,15 @@ IDisposable IModuleNavigationService.BindingNavigationHandler(IModuleNavigationH
     IDisposable IViewNavigationService.BindingViewNavigationHandler(IViewNavigationHandler handler)
     {
         _viewHandlers.Add(handler);
-        foreach (var (regionName, viewName, parameters, requestNew) in _bufferViewName)
+        foreach (var (regionName, viewName, parameters) in _bufferViewName)
         {
             if (parameters == null)
             {
-                handler.OnNavigateTo(regionName, viewName, requestNew);
+                handler.OnNavigateTo(regionName, viewName);
             }
             else
             {
-                handler.OnNavigateTo(regionName, viewName, parameters, requestNew);
+                handler.OnNavigateTo(regionName, viewName, parameters);
             }
         }
         return new DisposableAction(() =>
diff --git a/src/Lemon.ModuleNavigation/RegionManager.cs b/src/Lemon.ModuleNavigation/RegionManager.cs
index cff68e3..ff7a267 100644
--- a/src/Lemon.ModuleNavigation/RegionManager.cs
+++ b/src/Lemon.ModuleNavigation/RegionManager.cs
@@ -16,6 +16,7 @@ public RegionManager(IServiceProvider serviceProvider)
         _serviceProvider = serviceProvider;
     }
 
+    [Obsolete("requestNew was obsolete.Consider IsNavigationTarget() in INavigationAware instead.")]
     public void RequestNavigate(string regionName, string viewName, bool requestNew, NavigationParameters? parameters = null)
     {
         var context = new NavigationContext(viewName, regionName, _serviceProvider, requestNew, parameters);
@@ -40,6 +41,30 @@ public void RequestNavigate(string regionName, string viewName, bool requestNew,
                 });
         }
     }
+    public void RequestNavigate(string regionName, string viewName, NavigationParameters? parameters = null)
+    {
+        var context = new NavigationContext(viewName, regionName, _serviceProvider, parameters);
+        if (_regions.TryGetValue(regionName, out var region))
+        {
+            region.Activate(context);
+            ToNavigationObservers(context);
+        }
+        else
+        {
+            _buffer.AddOrUpdate(regionName,
+                key =>
+                {
+                    var stack = new ConcurrentStack<NavigationContext>();
+                    stack.Push(context);
+                    return stack;
+                },
+                (key, value) =>
+                {
+                    value.Push(context);
+                    return value;
+                });
+        }
+    }
 
     public void AddRegion(string regionName, IRegion region)
     {

From 1f2e472890c68bc992ddee8d4cf6eec90ceca52e Mon Sep 17 00:00:00 2001
From: Easley <nevermore.wd@me.com>
Date: Wed, 2 Apr 2025 15:45:05 +0800
Subject: [PATCH 12/15] wpfdone:code format

---
 .../Views/ViewAlpha.xaml.cs                   | 30 +++++--------------
 .../Views/ViewBeta.xaml.cs                    | 17 +++++------
 2 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/src/Lemon.ModuleNavigation.WpfSample/Views/ViewAlpha.xaml.cs b/src/Lemon.ModuleNavigation.WpfSample/Views/ViewAlpha.xaml.cs
index 64307f3..bc57de3 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/Views/ViewAlpha.xaml.cs
+++ b/src/Lemon.ModuleNavigation.WpfSample/Views/ViewAlpha.xaml.cs
@@ -1,29 +1,15 @@
 using Lemon.ModuleNavigation.Abstractions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
-namespace Lemon.ModuleNavigation.WpfSample.Views
+namespace Lemon.ModuleNavigation.WpfSample.Views;
+
+/// <summary>
+/// Interaction logic for ViewAlpha.xaml
+/// </summary>
+public partial class ViewAlpha : UserControl, IView
 {
-    /// <summary>
-    /// Interaction logic for ViewAlpha.xaml
-    /// </summary>
-    public partial class ViewAlpha : UserControl,IView
+    public ViewAlpha()
     {
-        public ViewAlpha()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
 }
diff --git a/src/Lemon.ModuleNavigation.WpfSample/Views/ViewBeta.xaml.cs b/src/Lemon.ModuleNavigation.WpfSample/Views/ViewBeta.xaml.cs
index 50287e5..dff684f 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/Views/ViewBeta.xaml.cs
+++ b/src/Lemon.ModuleNavigation.WpfSample/Views/ViewBeta.xaml.cs
@@ -1,16 +1,15 @@
 using Lemon.ModuleNavigation.Abstractions;
 using System.Windows.Controls;
 
-namespace Lemon.ModuleNavigation.WpfSample.Views
+namespace Lemon.ModuleNavigation.WpfSample.Views;
+
+/// <summary>
+/// Interaction logic for ViewBeta.xaml
+/// </summary>
+public partial class ViewBeta : UserControl, IView
 {
-    /// <summary>
-    /// Interaction logic for ViewBeta.xaml
-    /// </summary>
-    public partial class ViewBeta : UserControl, IView
+    public ViewBeta()
     {
-        public ViewBeta()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
 }

From 88abc18d70fd3ec9db41ef23dd3a9e71b6005a23 Mon Sep 17 00:00:00 2001
From: Easley <nevermore.wd@me.com>
Date: Wed, 2 Apr 2025 16:25:42 +0800
Subject: [PATCH 13/15] avaloniaui ok

---
 .../AssemblyInfo.cs                           |   3 +-
 .../Lemon.ModuleNavigation.Avaloniaui.csproj  |   4 +
 .../NavigationExtension.cs                    |   8 -
 .../Regions/ContentRegion.cs                  | 117 ++++++++++++++
 .../Regions/ItemsRegion.cs                    | 134 +++++++++++++++
 .../Regions/Region.cs                         | 152 ++++++++++++++++++
 .../Regions/TabRegion.cs                      |  48 ++++++
 .../RegionsExtension.cs                       |   7 +-
 .../{ => RegionsOld}/ContentRegion.cs         |   5 +-
 .../{ => RegionsOld}/ItemsRegion.cs           |   4 +-
 .../{Region.cs => RegionsOld/RegionBak.cs}    |   6 +-
 .../{ => RegionsOld}/TabRegion.cs             |   4 +-
 .../ViewModels/BaseNavigationViewModel.cs     |  26 ++-
 .../ViewModels/MainViewModel.cs               |  35 ++--
 .../ViewModels/ViewAlphaViewModel.cs          |  78 ++++-----
 .../ViewModels/ViewBetaViewModel.cs           |  15 --
 .../Views/MainView.axaml                      |   3 +-
 .../Views/ViewAlpha.axaml                     |  32 ++--
 .../Views/ViewBeta.axaml                      |  24 ++-
 .../Abstractions/IModuleManager.cs            |   4 +-
 .../Abstractions/IModuleNavigationHandler.cs  |   2 +-
 .../IModuleNavigationHandler{T}.cs            |   2 +-
 .../Abstractions/IModuleNavigationService.cs  |   2 +-
 .../IModuleNavigationService{T}.cs            |   2 +-
 src/Lemon.ModuleNavigation/ModuleManager.cs   |   4 +-
 .../NavigationHandler.cs                      |   4 +-
 .../NavigationService.cs                      |   8 +-
 27 files changed, 601 insertions(+), 132 deletions(-)
 create mode 100644 src/Lemon.ModuleNavigation.Avaloniaui/Regions/ContentRegion.cs
 create mode 100644 src/Lemon.ModuleNavigation.Avaloniaui/Regions/ItemsRegion.cs
 create mode 100644 src/Lemon.ModuleNavigation.Avaloniaui/Regions/Region.cs
 create mode 100644 src/Lemon.ModuleNavigation.Avaloniaui/Regions/TabRegion.cs
 rename src/Lemon.ModuleNavigation.Avaloniaui/{ => RegionsOld}/ContentRegion.cs (94%)
 rename src/Lemon.ModuleNavigation.Avaloniaui/{ => RegionsOld}/ItemsRegion.cs (97%)
 rename src/Lemon.ModuleNavigation.Avaloniaui/{Region.cs => RegionsOld/RegionBak.cs} (94%)
 rename src/Lemon.ModuleNavigation.Avaloniaui/{ => RegionsOld}/TabRegion.cs (96%)

diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/AssemblyInfo.cs b/src/Lemon.ModuleNavigation.Avaloniaui/AssemblyInfo.cs
index b41cdfb..b93bbf1 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/AssemblyInfo.cs
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/AssemblyInfo.cs
@@ -2,4 +2,5 @@
 
 [assembly: XmlnsPrefix("https://github.com/NeverMorewd/Lemon.ModuleNavigation", "lm")]
 [assembly: XmlnsDefinition("https://github.com/NeverMorewd/Lemon.ModuleNavigation", "Lemon.ModuleNavigation")]
-[assembly: XmlnsDefinition("https://github.com/NeverMorewd/Lemon.ModuleNavigation", "Lemon.ModuleNavigation.Avaloniaui")]
\ No newline at end of file
+[assembly: XmlnsDefinition("https://github.com/NeverMorewd/Lemon.ModuleNavigation", "Lemon.ModuleNavigation.Avaloniaui")]
+[assembly: XmlnsDefinition("https://github.com/NeverMorewd/Lemon.ModuleNavigation", "Lemon.ModuleNavigation.Avaloniaui.Regions")]
\ No newline at end of file
diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/Lemon.ModuleNavigation.Avaloniaui.csproj b/src/Lemon.ModuleNavigation.Avaloniaui/Lemon.ModuleNavigation.Avaloniaui.csproj
index eced45c..ce7dc98 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/Lemon.ModuleNavigation.Avaloniaui.csproj
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/Lemon.ModuleNavigation.Avaloniaui.csproj
@@ -15,9 +15,13 @@
 
 	<ItemGroup>
 	  <AvaloniaXaml Remove="bin\**" />
+	  <AvaloniaXaml Remove="RegionsOld\**" />
 	  <Compile Remove="bin\**" />
+	  <Compile Remove="RegionsOld\**" />
 	  <EmbeddedResource Remove="bin\**" />
+	  <EmbeddedResource Remove="RegionsOld\**" />
 	  <None Remove="bin\**" />
+	  <None Remove="RegionsOld\**" />
 	</ItemGroup>
 
   <ItemGroup>
diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/NavigationExtension.cs b/src/Lemon.ModuleNavigation.Avaloniaui/NavigationExtension.cs
index 6608ecd..685acac 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/NavigationExtension.cs
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/NavigationExtension.cs
@@ -179,14 +179,6 @@ private static void UnloadModule(object? sender, RoutedEventArgs e)
                         }
                     }
                 }
-                else if (tabItem.DataContext is NavigationContext navigationContext)
-                {
-                    if (tabContainer.DataContext is IServiceAware serviceAware)
-                    {
-                        var regionManager = serviceAware.ServiceProvider.GetRequiredService<IRegionManager>();
-                        regionManager.RequestUnload(navigationContext);
-                    }
-                }
             }
         }
     }
diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/Regions/ContentRegion.cs b/src/Lemon.ModuleNavigation.Avaloniaui/Regions/ContentRegion.cs
new file mode 100644
index 0000000..806709a
--- /dev/null
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/Regions/ContentRegion.cs
@@ -0,0 +1,117 @@
+using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using Avalonia.Data;
+using Avalonia.Markup.Xaml.Templates;
+using Lemon.ModuleNavigation.Abstractions;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace Lemon.ModuleNavigation.Avaloniaui.Regions;
+
+public class ContentRegion : Region, IContentRegionContext<IDataTemplate>
+{
+    private readonly ContentControl _contentControl;
+    public ContentRegion(string name, ContentControl contentControl) : base(name)
+    {
+        _contentControl = contentControl;
+        SetBindingContentTemplate();
+        SetBindingContent();
+    }
+
+    private object? _content;
+    public object? Content
+    {
+        get => _content;
+        set
+        {
+            _content = value;
+            OnPropertyChanged();
+        }
+    }
+
+    private IDataTemplate? _contentTemplate;
+    public IDataTemplate? ContentTemplate
+    {
+        get => _contentTemplate;
+        set
+        {
+            _contentTemplate = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public event PropertyChangedEventHandler? PropertyChanged;
+
+    /// <summary>
+    /// When Views with same ViewName were found, the latest one will be picked.
+    /// </summary>
+    /// <param name="target"></param>
+    public override void Activate(NavigationContext target)
+    {
+        if (ViewCache.TryGetValue(target, out IView? accurateView))
+        {
+            target.View = accurateView;
+            Content = target;
+        }
+        else if (ViewNameCache.TryGetValue(target.ViewName, out IView? view)
+            && view.DataContext is INavigationAware navigationAware
+            && navigationAware.IsNavigationTarget(target))
+        {
+            var context = Contexts.First(c => c.ViewName == target.ViewName);
+            context.View = view;
+            Content = context;
+        }
+        else
+        {
+            Contexts.Add(target);
+            Content = target;
+        }
+    }
+
+    public override void DeActivate(string regionName)
+    {
+        if (Content is NavigationContext current)
+        {
+            if (current.ViewName == regionName)
+            {
+                Contexts.Remove(current);
+                Content = null;
+            }
+        }
+    }
+    public override void DeActivate(NavigationContext navigationContext)
+    {
+        if (Content is NavigationContext current)
+        {
+            if (NavigationContext.ViewNameComparer.Equals(current, navigationContext))
+            {
+                Contexts.Remove(current);
+                Content = null;
+            }
+        }
+    }
+    
+    protected virtual void SetBindingContentTemplate()
+    {
+        ContentTemplate = RegionContentTemplate;
+        _contentControl.Bind(ContentControl.ContentTemplateProperty,
+               new Binding(nameof(ContentTemplate))
+               {
+                   Source = this,
+                   Mode = BindingMode.TwoWay
+               });
+    }
+    protected virtual void SetBindingContent()
+    {
+        _contentControl.Bind(ContentControl.ContentProperty,
+               new Binding(nameof(Content))
+               {
+                   Source = this,
+                   Mode = BindingMode.TwoWay
+               });
+    }
+    protected void OnPropertyChanged([CallerMemberName] string? propertyName = null)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
+}
diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/Regions/ItemsRegion.cs b/src/Lemon.ModuleNavigation.Avaloniaui/Regions/ItemsRegion.cs
new file mode 100644
index 0000000..3ac3d7d
--- /dev/null
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/Regions/ItemsRegion.cs
@@ -0,0 +1,134 @@
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Templates;
+using Avalonia.Data;
+using Avalonia.Markup.Xaml.Templates;
+using Lemon.ModuleNavigation.Abstractions;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace Lemon.ModuleNavigation.Avaloniaui.Regions;
+
+public class ItemsRegion : Region, IItemsRegionDataContext<IDataTemplate>
+{
+    private readonly ItemsControl _itemsControl;
+    public ItemsRegion(string name, ItemsControl itemsControl) : base(name)
+    {
+        _itemsControl = itemsControl;
+        SetBindingItemTemplate();
+        SetBindingSelectedItem();
+        SetBindingItemsSource();
+    }
+    private object? _selectItem;
+    public object? SelectedItem
+    {
+        get
+        {
+            return _selectItem;
+        }
+        set
+        {
+            _selectItem = value;
+            OnPropertyChanged();
+        }
+    }
+
+    private IDataTemplate? _itemsTemplate;
+    public IDataTemplate? ItemTemplate
+    {
+        get => _itemsTemplate;
+        set
+        {
+            _itemsTemplate = value;
+            OnPropertyChanged();
+        }
+    }
+    public event PropertyChangedEventHandler? PropertyChanged;
+
+    public override void ScrollIntoView(int index)
+    {
+        _itemsControl.ScrollIntoView(index);
+    }
+    public override void ScrollIntoView(NavigationContext item)
+    {
+        _itemsControl.ScrollIntoView(item);
+    }
+
+    /// <summary>
+    /// When Views with same ViewName were found, the earliest one will be picked.
+    /// </summary>
+    /// <param name="target"></param>
+    public override void Activate(NavigationContext target)
+    {
+        try
+        {
+            if (ViewCache.TryGetValue(target, out IView? accurateView))
+            {
+                target.View = accurateView;
+                SelectedItem = target;
+                return;
+            }
+            var context = Contexts.FirstOrDefault(c => c.ViewName == target.ViewName);
+            if (context is not null
+                && context.View is not null
+                && context.View.DataContext is INavigationAware navigationAware
+                && navigationAware.IsNavigationTarget(target))
+            {
+                SelectedItem = context;
+                return;
+            }
+            Contexts.Add(target);
+            SelectedItem = target;
+        }
+        finally
+        {
+            ScrollIntoView((SelectedItem as NavigationContext)!);
+        }
+    }
+    public override void DeActivate(string viewName)
+    {
+        Contexts.Remove(Contexts.Last(c => c.ViewName == viewName));
+    }
+    public override void DeActivate(NavigationContext navigationContext)
+    {
+        Contexts.Remove(navigationContext);
+    }
+    public void Add(NavigationContext item)
+    {
+        Contexts.Add(item);
+    }
+
+    protected virtual void SetBindingItemsSource()
+    {
+        _itemsControl.Bind(ItemsControl.ItemsSourceProperty,
+                               new Binding(nameof(Contexts))
+                               {
+                                   Source = this
+                               });
+    }
+    protected virtual void SetBindingItemTemplate()
+    {
+        ItemTemplate = RegionContentTemplate;
+        _itemsControl.Bind(ItemsControl.ItemTemplateProperty,
+                       new Binding(nameof(ItemTemplate))
+                       {
+                           Source = this
+                       });
+    }
+    protected virtual void SetBindingSelectedItem()
+    {
+        if (_itemsControl is SelectingItemsControl selector)
+        {
+            selector.Bind(SelectingItemsControl.SelectedItemProperty,
+                new Binding(nameof(SelectedItem))
+                {
+                    Source = this,
+                    Mode = BindingMode.TwoWay
+                });
+        }
+    }
+    protected void OnPropertyChanged([CallerMemberName] string? propertyName = null)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
+}
diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/Regions/Region.cs b/src/Lemon.ModuleNavigation.Avaloniaui/Regions/Region.cs
new file mode 100644
index 0000000..d50f933
--- /dev/null
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/Regions/Region.cs
@@ -0,0 +1,152 @@
+using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using Avalonia.Markup.Xaml.Templates;
+using Lemon.ModuleNavigation.Abstractions;
+using Lemon.ModuleNavigation.Core;
+using Microsoft.Extensions.DependencyInjection;
+using System.Collections.Concurrent;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+
+namespace Lemon.ModuleNavigation.Avaloniaui.Regions;
+
+public abstract class Region : IRegion
+{
+    public Region(string name)
+    {
+        Name = name;
+        Current = new();
+        ViewCache = [];
+        Contexts = [];
+        RegionContentTemplate = CreateRegionDataTemplate();
+        Contexts.CollectionChanged += Contexts_CollectionChanged;
+    }
+    protected ConcurrentItem<(IView View, INavigationAware NavigationAware)> Current
+    {
+        get;
+    }
+    public string Name
+    {
+        get;
+    }
+    protected ConcurrentDictionary<NavigationContext, IView> ViewCache
+    {
+        get;
+    }
+
+    protected ConcurrentDictionary<string, IView> ViewNameCache
+    {
+        get
+        {
+            return new(Contexts
+                    .GroupBy(kv => kv.ViewName)
+                    .Select(group => new KeyValuePair<string, IView>(
+                        group.Key,
+                        group.Last().View!)));
+        }
+    }
+    public ObservableCollection<NavigationContext> Contexts
+    {
+        get;
+    }
+
+    public IDataTemplate? RegionContentTemplate
+    {
+        get;
+    }
+    public virtual void ScrollIntoView(int index)
+    {
+        throw new NotImplementedException();
+    }
+    public virtual void ScrollIntoView(NavigationContext item)
+    {
+        throw new NotImplementedException();
+    }
+    public abstract void Activate(NavigationContext target);
+    public abstract void DeActivate(string viewName);
+    public abstract void DeActivate(NavigationContext target);
+
+    protected IView? ResolveView(NavigationContext context)
+    {
+        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);
+            navigationAware.RequestUnload += () =>
+            {
+                DeActivate(context);
+            };
+            Current.SetData((view, navigationAware));
+            context.View = view;
+            ViewCache.AddOrUpdate(context, view, (key, value) => view);
+        }
+        return view;
+    }
+
+    protected virtual void WhenContextsAdded(IEnumerable<NavigationContext> contexts)
+    {
+
+    }
+    protected virtual void WhenContextsRemoved(IEnumerable<NavigationContext> contexts)
+    {
+
+    }
+    private void Contexts_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+    {
+        if (e.Action == NotifyCollectionChangedAction.Add)
+        {
+            if (e.NewItems is not null)
+            {
+                WhenContextsAdded(e.NewItems.Cast<NavigationContext>());
+            }
+        }
+        if (e.Action == NotifyCollectionChangedAction.Remove)
+        {
+            if (e.OldItems is not null)
+            {
+                WhenContextsRemoved(e.OldItems.Cast<NavigationContext>());
+            }
+        }
+    }
+    private IDataTemplate CreateRegionDataTemplate()
+    {
+        return new FuncDataTemplate<NavigationContext>((context, np) =>
+        {
+            if (context is null)
+            {
+                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);
+                navigationAware.RequestUnload += () =>
+                {
+                    DeActivate(context);
+                };
+                Current.SetData((view, navigationAware));
+                context.View = view;
+                ViewCache.AddOrUpdate(context, view, (key, value) => view);
+            }
+            return view as Control;
+        });
+    }
+}
diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/Regions/TabRegion.cs b/src/Lemon.ModuleNavigation.Avaloniaui/Regions/TabRegion.cs
new file mode 100644
index 0000000..015d89c
--- /dev/null
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/Regions/TabRegion.cs
@@ -0,0 +1,48 @@
+using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using Avalonia.Data;
+using Avalonia.Markup.Xaml.Templates;
+using Lemon.ModuleNavigation.Abstractions;
+
+namespace Lemon.ModuleNavigation.Avaloniaui.Regions;
+
+public class TabRegion : ItemsRegion, IContentRegionContext<IDataTemplate>
+{
+    private readonly TabControl _tabControl;
+    public TabRegion(string name, TabControl tabControl) : base(name, tabControl)
+    {
+        _tabControl = tabControl;
+        SetBindingContentTemplate();
+    }
+
+    public object? Content
+    {
+        get => throw new NotImplementedException();
+        set => throw new NotImplementedException();
+    }
+
+    private IDataTemplate? _contentTemplate;
+    public IDataTemplate? ContentTemplate
+    {
+        get => _contentTemplate;
+        set
+        {
+            _contentTemplate = value;
+            OnPropertyChanged();
+        }
+    }
+    protected override void SetBindingItemTemplate()
+    {
+        //base.SetBindingItemTemplate();
+    }
+    protected virtual void SetBindingContentTemplate()
+    {
+        ContentTemplate = RegionContentTemplate;
+        _tabControl.Bind(TabControl.ContentTemplateProperty,
+                               new Binding(nameof(ContentTemplate))
+                               {
+                                   Mode = BindingMode.TwoWay,
+                                   Source = this
+                               });
+    }
+}
diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/RegionsExtension.cs b/src/Lemon.ModuleNavigation.Avaloniaui/RegionsExtension.cs
index f352fb1..93cf0eb 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/RegionsExtension.cs
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/RegionsExtension.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls;
 using Lemon.ModuleNavigation.Abstractions;
+using Lemon.ModuleNavigation.Avaloniaui.Regions;
 
 namespace Lemon.ModuleNavigation.Avaloniaui;
 
@@ -9,9 +10,9 @@ public static IRegion ToRegion(this Control control, string name)
     {
         return control switch
         {
-            TabControl tabControl => new TabRegion(tabControl, name),
-            ItemsControl itemsControl => new ItemsRegion(itemsControl, name),
-            ContentControl contentControl => new ContentRegion(contentControl, name),
+            TabControl tabControl => new TabRegion(name, tabControl),
+            ItemsControl itemsControl => new ItemsRegion(name, itemsControl),
+            ContentControl contentControl => new ContentRegion(name, contentControl),
             _ => throw new NotSupportedException($"Unsupported control:{control.GetType()}"),
         };
     }
diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/ContentRegion.cs b/src/Lemon.ModuleNavigation.Avaloniaui/RegionsOld/ContentRegion.cs
similarity index 94%
rename from src/Lemon.ModuleNavigation.Avaloniaui/ContentRegion.cs
rename to src/Lemon.ModuleNavigation.Avaloniaui/RegionsOld/ContentRegion.cs
index 23c3999..9b045c1 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/ContentRegion.cs
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/RegionsOld/ContentRegion.cs
@@ -1,14 +1,13 @@
 using Avalonia.Controls;
 using Lemon.ModuleNavigation.Abstractions;
 using Lemon.ModuleNavigation.Core;
-using Microsoft.Extensions.DependencyInjection;
 using System.Collections.Concurrent;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 
-namespace Lemon.ModuleNavigation.Avaloniaui;
+namespace Lemon.ModuleNavigation.Avaloniaui.RegionsOld;
 
-public class ContentRegion : Region
+public class ContentRegion : RegionBak
 {
     private readonly ConcurrentDictionary<string, IView> _viewCache = new();
     private readonly ConcurrentItem<(IView View, INavigationAware NavigationAware)> _current = new();
diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/ItemsRegion.cs b/src/Lemon.ModuleNavigation.Avaloniaui/RegionsOld/ItemsRegion.cs
similarity index 97%
rename from src/Lemon.ModuleNavigation.Avaloniaui/ItemsRegion.cs
rename to src/Lemon.ModuleNavigation.Avaloniaui/RegionsOld/ItemsRegion.cs
index 3e06cb3..65702b5 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/ItemsRegion.cs
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/RegionsOld/ItemsRegion.cs
@@ -3,9 +3,9 @@
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 
-namespace Lemon.ModuleNavigation.Avaloniaui;
+namespace Lemon.ModuleNavigation.Avaloniaui.RegionsOld;
 
-public class ItemsRegion : Region
+public class ItemsRegion : RegionBak
 {
     private readonly ItemsControl _itemsControl;
     public ItemsRegion(ItemsControl itemsControl, string name)
diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/Region.cs b/src/Lemon.ModuleNavigation.Avaloniaui/RegionsOld/RegionBak.cs
similarity index 94%
rename from src/Lemon.ModuleNavigation.Avaloniaui/Region.cs
rename to src/Lemon.ModuleNavigation.Avaloniaui/RegionsOld/RegionBak.cs
index 62167c6..4eb43f9 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/Region.cs
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/RegionsOld/RegionBak.cs
@@ -6,14 +6,14 @@
 using System.Collections.Concurrent;
 using System.Collections.ObjectModel;
 
-namespace Lemon.ModuleNavigation.Avaloniaui;
+namespace Lemon.ModuleNavigation.Avaloniaui.RegionsOld;
 
-public abstract class Region : IRegion
+public abstract class RegionBak : IRegion
 {
     private readonly ConcurrentDictionary<string, IView> _viewCache = new();
     private readonly ConcurrentItem<(IView View, INavigationAware NavigationAware)> _current = new();
 
-    public Region()
+    public RegionBak()
     {
         RegionTemplate = CreateRegionDataTemplate();
     }
diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/TabRegion.cs b/src/Lemon.ModuleNavigation.Avaloniaui/RegionsOld/TabRegion.cs
similarity index 96%
rename from src/Lemon.ModuleNavigation.Avaloniaui/TabRegion.cs
rename to src/Lemon.ModuleNavigation.Avaloniaui/RegionsOld/TabRegion.cs
index ec4bfa3..c5b5070 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/TabRegion.cs
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/RegionsOld/TabRegion.cs
@@ -6,9 +6,9 @@
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 
-namespace Lemon.ModuleNavigation.Avaloniaui;
+namespace Lemon.ModuleNavigation.Avaloniaui.RegionsOld;
 
-public class TabRegion : Region, INotifyPropertyChanged
+public class TabRegion : RegionBak, INotifyPropertyChanged
 {
     private readonly TabControl _tabControl;
      public TabRegion(TabControl tabControl, string name)
diff --git a/src/Lemon.ModuleNavigation.Sample/ViewModels/BaseNavigationViewModel.cs b/src/Lemon.ModuleNavigation.Sample/ViewModels/BaseNavigationViewModel.cs
index b737304..4eb964d 100644
--- a/src/Lemon.ModuleNavigation.Sample/ViewModels/BaseNavigationViewModel.cs
+++ b/src/Lemon.ModuleNavigation.Sample/ViewModels/BaseNavigationViewModel.cs
@@ -1,6 +1,8 @@
 using Lemon.ModuleNavigation.Abstractions;
 using ReactiveUI;
 using System;
+using System.Diagnostics;
+using System.Reactive;
 
 namespace Lemon.ModuleNavigation.Sample.ViewModels;
 
@@ -8,6 +10,21 @@ public class BaseNavigationViewModel : ReactiveObject, INavigationAware, IDispos
 {
     public virtual string Greeting => $"Welcome to {GetType().Name}[{Environment.ProcessId}][{Environment.CurrentManagedThreadId}]{Environment.NewLine}{DateTime.Now:yyyy-MM-dd HH-mm-ss.ffff}";
 
+
+    public BaseNavigationViewModel()
+    {
+        UnloadViewCommand = ReactiveCommand.Create(() =>
+        {
+            var code = this.GetHashCode();
+            Debug.WriteLine(code);
+            RequestUnload?.Invoke();
+        });
+    }
+    public ReactiveCommand<Unit, Unit> UnloadViewCommand
+    {
+        get;
+    }
+
     public event Action? RequestUnload;
 
     public virtual void Dispose()
@@ -17,7 +34,14 @@ public virtual void Dispose()
 
     public virtual bool IsNavigationTarget(NavigationContext navigationContext)
     {
-        return !navigationContext.RequestNew;
+        if (navigationContext.Parameters is not null)
+        {
+            if (navigationContext.Parameters.TryGetValue("requestNew", out bool requestNew))
+            {
+                return !requestNew;
+            }
+        }
+        return true;
     }
 
     public virtual void OnNavigatedFrom(NavigationContext navigationContext)
diff --git a/src/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs b/src/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
index 41c1dc5..9fa1598 100644
--- a/src/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
+++ b/src/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
@@ -1,6 +1,5 @@
 using Lemon.ModuleNavigation.Abstractions;
 using Lemon.ModuleNavigation.Core;
-using Lemon.ModuleNavigation.Dialogs;
 using Lemon.ModuleNavigation.Extensions;
 using Microsoft.Extensions.Logging;
 using ReactiveUI;
@@ -11,7 +10,7 @@
 
 namespace Lemon.ModuleNavigation.Sample.ViewModels;
 
-public class MainViewModel : BaseNavigationViewModel, IServiceAware
+public class MainViewModel : ReactiveObject, IServiceAware
 {
     private readonly NavigationService _navigationService;
     private readonly IServiceProvider _serviceProvider;
@@ -31,9 +30,9 @@ public MainViewModel(IEnumerable<IModule> modules,
         _dialogService = dialogService;
         _regionManager = regionManager;
         // default views for different regions
-        _navigationService.RequestViewNavigation("ContentRegion", "ViewAlpha", false);
-        _navigationService.RequestViewNavigation("TransitioningContentRegion", "ViewAlpha", false);
-        Modules = new ObservableCollection<IModule>(modules);
+        _navigationService.RequestViewNavigation("ContentRegion", "ViewAlpha");
+        _navigationService.RequestViewNavigation("TransitioningContentRegion", "ViewAlpha");
+        Modules = [.. modules];
         ToViewCommand = ReactiveCommand.Create<string>(content => 
         {
             var viewName = content;
@@ -44,10 +43,18 @@ public MainViewModel(IEnumerable<IModule> modules,
                 requestNew = true;
 
             }
-            _navigationService.RequestViewNavigation("ContentRegion", viewName, requestNew);
-            _navigationService.RequestViewNavigation("TabRegion", viewName, requestNew);
-            _navigationService.RequestViewNavigation("ItemsRegion", viewName, requestNew);
-            _navigationService.RequestViewNavigation("TransitioningContentRegion", viewName, requestNew);
+            _navigationService.RequestViewNavigation("ContentRegion", 
+                viewName, 
+                new NavigationParameters { { "requestNew", requestNew } });
+            _navigationService.RequestViewNavigation("TabRegion", 
+                viewName, 
+                new NavigationParameters { { "requestNew", requestNew } });
+            _navigationService.RequestViewNavigation("ItemsRegion", 
+                viewName, 
+                new NavigationParameters { { "requestNew", requestNew } });
+            _navigationService.RequestViewNavigation("TransitioningContentRegion",
+                viewName, 
+                new NavigationParameters { { "requestNew", requestNew } });
         });
         ShowCommand = ReactiveCommand.Create<string>(content =>
         {
@@ -94,6 +101,12 @@ await _dialogService.ShowDialog(content,
             _logger.LogDebug($"ShowDialog over:{result}");
         });
 
+
+        UnloadViewCommand = ReactiveCommand.Create<NavigationContext>((context) =>
+        {
+            _regionManager.RequestUnload(context);
+        });
+
         _regionManager.NavigationSubscribe<NavigationContext>(n => 
         {
             _logger.LogDebug($"Request to : {n.RegionName}.{n.ViewName}");
@@ -103,6 +116,10 @@ await _dialogService.ShowDialog(content,
             _logger.LogDebug($"New region : {r.Name}");
         });
     }
+    public ReactiveCommand<NavigationContext, Unit> UnloadViewCommand
+    {
+        get;
+    }
     public ReactiveCommand<string, Unit> ToViewCommand
     {
         get;
diff --git a/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewAlphaViewModel.cs b/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewAlphaViewModel.cs
index f393aa8..7ea4585 100644
--- a/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewAlphaViewModel.cs
+++ b/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewAlphaViewModel.cs
@@ -5,60 +5,44 @@
 using System;
 using System.Reactive;
 
-namespace Lemon.ModuleNavigation.Sample.ViewModels
+namespace Lemon.ModuleNavigation.Sample.ViewModels;
+
+public class ViewAlphaViewModel : BaseNavigationViewModel, IDialogAware
 {
-    public class ViewAlphaViewModel : BaseNavigationViewModel, IDialogAware
+    private readonly ILogger _logger;
+    public ViewAlphaViewModel(ILogger<ViewAlphaViewModel> logger)
     {
-        private readonly ILogger _logger;
-        public ViewAlphaViewModel(ILogger<ViewAlphaViewModel> logger)
-        {
-            _logger = logger;
-            CloseCommand = ReactiveCommand.Create(() => 
-            {
-                var param = new DialogParameters
-                {
-                    { "from", nameof(ViewAlphaViewModel) }
-                };
-                RequestClose?.Invoke(new DialogResult(ButtonResult.OK, param));
-            });
-        }
-        private bool _isDialog = false;
-        public bool IsDialog
+        _logger = logger;
+        CloseCommand = ReactiveCommand.Create(() => 
         {
-            get => _isDialog;
-            set
+            var param = new DialogParameters
             {
-                this.RaiseAndSetIfChanged(ref _isDialog, value);
-            }
-        }
-        public ReactiveCommand<Unit, Unit> CloseCommand { get; } 
-        public string Title => nameof(ViewAlphaViewModel);
-        public event Action<IDialogResult>? RequestClose;
-
-        public void OnDialogClosed()
-        {
-            _logger.LogInformation("OnDialogClosed");
-        }
-
-        public void OnDialogOpened(IDialogParameters? parameters)
-        {
-            _logger.LogInformation($"OnDialogOpened:{parameters?.ToString()}");
-            IsDialog = true;
-        }
-
-        public void OnNavigatedTo(NavigationContext navigationContext)
+                { "from", nameof(ViewAlphaViewModel) }
+            };
+            RequestClose?.Invoke(new DialogResult(ButtonResult.OK, param));
+        });
+    }
+    private bool _isDialog = false;
+    public bool IsDialog
+    {
+        get => _isDialog;
+        set
         {
-            //throw new NotImplementedException();
+            this.RaiseAndSetIfChanged(ref _isDialog, value);
         }
+    }
+    public ReactiveCommand<Unit, Unit> CloseCommand { get; } 
+    public string Title => nameof(ViewAlphaViewModel);
+    public event Action<IDialogResult>? RequestClose;
 
-        public bool IsNavigationTarget(NavigationContext navigationContext)
-        {
-            return true;
-        }
+    public void OnDialogClosed()
+    {
+        _logger.LogInformation("OnDialogClosed");
+    }
 
-        public void OnNavigatedFrom(NavigationContext navigationContext)
-        {
-            //throw new NotImplementedException();
-        }
+    public void OnDialogOpened(IDialogParameters? parameters)
+    {
+        _logger.LogInformation($"OnDialogOpened:{parameters?.ToString()}");
+        IsDialog = true;
     }
 }
diff --git a/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewBetaViewModel.cs b/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewBetaViewModel.cs
index 28812e1..b0c30e7 100644
--- a/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewBetaViewModel.cs
+++ b/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewBetaViewModel.cs
@@ -45,19 +45,4 @@ public void OnDialogOpened(IDialogParameters? parameters)
         _logger.LogInformation($"OnDialogOpened:{parameters?.ToString()}");
         IsDialog = true;
     }
-
-    public void OnNavigatedTo(NavigationContext navigationContext)
-    {
-
-    }
-
-    public bool IsNavigationTarget(NavigationContext navigationContext)
-    {
-        return true;
-    }
-
-    public void OnNavigatedFrom(NavigationContext navigationContext)
-    {
-
-    }
 }
diff --git a/src/Lemon.ModuleNavigation.Sample/Views/MainView.axaml b/src/Lemon.ModuleNavigation.Sample/Views/MainView.axaml
index 89b405f..052df74 100644
--- a/src/Lemon.ModuleNavigation.Sample/Views/MainView.axaml
+++ b/src/Lemon.ModuleNavigation.Sample/Views/MainView.axaml
@@ -152,7 +152,8 @@
                                         Padding="-1,0,0,0"
                                         VerticalContentAlignment="Center"
                                         Width="20"
-                                        lm:NavigationExtension.CanUnload="True" />
+                                        Command="{Binding DataContext.UnloadViewCommand, RelativeSource={RelativeSource AncestorType=TabControl}}"
+                                        CommandParameter="{Binding}" />
                                 </StackPanel>
                             </DataTemplate>
                         </TabControl.ItemTemplate>
diff --git a/src/Lemon.ModuleNavigation.Sample/Views/ViewAlpha.axaml b/src/Lemon.ModuleNavigation.Sample/Views/ViewAlpha.axaml
index c4a766f..08565a8 100644
--- a/src/Lemon.ModuleNavigation.Sample/Views/ViewAlpha.axaml
+++ b/src/Lemon.ModuleNavigation.Sample/Views/ViewAlpha.axaml
@@ -8,21 +8,23 @@
     xmlns:lm="https://github.com/NeverMorewd/Lemon.ModuleNavigation"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Border BorderBrush="LemonChiffon" BorderThickness="2">
-        <StackPanel>
-            <TextBlock Text="{Binding Greeting}" />
-            <Button
+	<Border
+        Background="IndianRed"
+        BorderBrush="LemonChiffon"
+        HorizontalAlignment="Stretch"
+        BorderThickness="1">
+		<StackPanel>
+			<TextBlock Text="{Binding Greeting}" />
+			<Button
+                HorizontalContentAlignment="Center"
+                VerticalContentAlignment="Center"
+                Command="{Binding UnloadViewCommand}"
+                Content="UnloadView"
+                IsVisible="{Binding !IsDialog}"/>
+			<Button
                 Command="{Binding CloseCommand}"
                 Content="CloseDialog"
-                Height="50"
-                IsVisible="{Binding IsDialog}"
-                Width="200" />
-            <!--  <Button  -->
-            <!--  Width="200"  -->
-            <!--  Height="50"  -->
-            <!--  lm:NavigationExtension.CanUnload="True"  -->
-            <!--  Content="UnloadView"  -->
-            <!--  IsVisible="{Binding !IsDialog}" />  -->
-        </StackPanel>
-    </Border>
+                IsVisible="{Binding IsDialog}" />
+		</StackPanel>
+	</Border>
 </UserControl>
diff --git a/src/Lemon.ModuleNavigation.Sample/Views/ViewBeta.axaml b/src/Lemon.ModuleNavigation.Sample/Views/ViewBeta.axaml
index 405e158..43e486b 100644
--- a/src/Lemon.ModuleNavigation.Sample/Views/ViewBeta.axaml
+++ b/src/Lemon.ModuleNavigation.Sample/Views/ViewBeta.axaml
@@ -7,15 +7,23 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
-    <Border BorderBrush="LemonChiffon" BorderThickness="2">
-        <StackPanel>
-            <TextBlock Text="{Binding Greeting}" />
-            <Button
-                Width="200"
-                Height="50"
+	<Border
+        Background="CadetBlue"
+        BorderBrush="LemonChiffon"
+        HorizontalAlignment="Stretch"
+        BorderThickness="1">
+		<StackPanel>
+			<TextBlock Text="{Binding Greeting}" />
+			<Button
+                HorizontalContentAlignment="Center"
+                VerticalContentAlignment="Center"
+                Command="{Binding UnloadViewCommand}"
+                Content="UnloadView"
+                IsVisible="{Binding !IsDialog}"/>
+			<Button
                 Command="{Binding CloseCommand}"
                 Content="CloseDialog"
                 IsVisible="{Binding IsDialog}" />
-        </StackPanel>
-    </Border>
+		</StackPanel>
+	</Border>
 </UserControl>
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IModuleManager.cs b/src/Lemon.ModuleNavigation/Abstractions/IModuleManager.cs
index 1156043..93d8d7a 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IModuleManager.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IModuleManager.cs
@@ -16,6 +16,6 @@ ObservableCollection<IModule> ActiveModules
     }
     IView CreateView(IModule module);
     IView GetOrCreateView(IModule module, string regionName);
-    void RequestNavigate(string moduleName, NavigationParameters parameters);
-    void RequestNavigate(IModule module, NavigationParameters parameters);
+    void RequestNavigate(string moduleName, NavigationParameters? parameters);
+    void RequestNavigate(IModule module, NavigationParameters? parameters);
 }
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationHandler.cs b/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationHandler.cs
index e85ea50..cb77973 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationHandler.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationHandler.cs
@@ -4,5 +4,5 @@ namespace Lemon.ModuleNavigation.Abstractions;
 
 public interface IModuleNavigationHandler
 {
-    void OnNavigateTo(string moduleKey, NavigationParameters parameters);
+    void OnNavigateTo(string moduleKey, NavigationParameters? parameters);
 }
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationHandler{T}.cs b/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationHandler{T}.cs
index 688c201..1ecfc9c 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationHandler{T}.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationHandler{T}.cs
@@ -4,5 +4,5 @@ namespace Lemon.ModuleNavigation.Abstractions;
 
 public interface IModuleNavigationHandler<in T> :IModuleNavigationHandler where T : IModule
 {
-    void OnNavigateTo(T module, NavigationParameters parameter);
+    void OnNavigateTo(T module, NavigationParameters? parameter);
 }
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationService.cs b/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationService.cs
index 625aa4b..18121be 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationService.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationService.cs
@@ -5,5 +5,5 @@ namespace Lemon.ModuleNavigation.Abstractions;
 public interface IModuleNavigationService
 {
     IDisposable BindingNavigationHandler(IModuleNavigationHandler handler);
-    void RequestModuleNavigate(string moduleKey, NavigationParameters parameters);
+    void RequestModuleNavigate(string moduleKey, NavigationParameters? parameters);
 }
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationService{T}.cs b/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationService{T}.cs
index 9df7741..135fb06 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationService{T}.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IModuleNavigationService{T}.cs
@@ -5,5 +5,5 @@ namespace Lemon.ModuleNavigation.Abstractions;
 public interface IModuleNavigationService<T> : IModuleNavigationService where T : IModule
 {
     IDisposable BindingNavigationHandler(IModuleNavigationHandler<T> handler);
-    void RequestModuleNavigate(T module, NavigationParameters parameters);
+    void RequestModuleNavigate(T module, NavigationParameters? parameters);
 }
diff --git a/src/Lemon.ModuleNavigation/ModuleManager.cs b/src/Lemon.ModuleNavigation/ModuleManager.cs
index 50a6ebe..d2b10d2 100644
--- a/src/Lemon.ModuleNavigation/ModuleManager.cs
+++ b/src/Lemon.ModuleNavigation/ModuleManager.cs
@@ -63,7 +63,7 @@ protected void OnPropertyChanged([CallerMemberName] string? propertyName = null)
         PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
     }
 
-    public void RequestNavigate(string moduleName, NavigationParameters parameters)
+    public void RequestNavigate(string moduleName, NavigationParameters? parameters)
     {
         if (_modulesCache.TryGetValue(moduleName, out var module))
         {
@@ -75,7 +75,7 @@ public void RequestNavigate(string moduleName, NavigationParameters parameters)
         }
     }
 
-    public void RequestNavigate(IModule module, NavigationParameters parameters)
+    public void RequestNavigate(IModule module, NavigationParameters? parameters)
     {
         if (module.ForceNew)
         {
diff --git a/src/Lemon.ModuleNavigation/NavigationHandler.cs b/src/Lemon.ModuleNavigation/NavigationHandler.cs
index 3a4bba3..1349a68 100644
--- a/src/Lemon.ModuleNavigation/NavigationHandler.cs
+++ b/src/Lemon.ModuleNavigation/NavigationHandler.cs
@@ -24,11 +24,11 @@ public NavigationHandler(INavigationService navigationService,
     public IModuleManager ModuleManager => _moduleManager;
 
 
-    public void OnNavigateTo(IModule module, NavigationParameters parameter)
+    public void OnNavigateTo(IModule module, NavigationParameters? parameter)
     {
         _moduleManager.RequestNavigate(module, parameter);
     }
-    public void OnNavigateTo(string moduleKey, NavigationParameters parameters)
+    public void OnNavigateTo(string moduleKey, NavigationParameters? parameters)
     {
         _moduleManager.RequestNavigate(moduleKey, parameters);
     }
diff --git a/src/Lemon.ModuleNavigation/NavigationService.cs b/src/Lemon.ModuleNavigation/NavigationService.cs
index 386824e..502402f 100644
--- a/src/Lemon.ModuleNavigation/NavigationService.cs
+++ b/src/Lemon.ModuleNavigation/NavigationService.cs
@@ -11,8 +11,8 @@ public class NavigationService : INavigationService
     private readonly List<IViewNavigationHandler> _viewHandlers = [];
 
     // reserve only one for now.
-    private readonly ConcurrentStack<(IModule module, NavigationParameters parameter)> _bufferModule = [];
-    private readonly ConcurrentStack<(string moduleName, NavigationParameters parameter)> _bufferModuleName = [];
+    private readonly ConcurrentStack<(IModule module, NavigationParameters? parameter)> _bufferModule = [];
+    private readonly ConcurrentStack<(string moduleName, NavigationParameters? parameter)> _bufferModuleName = [];
     private readonly ConcurrentStack<(string regionName, string viewName, NavigationParameters? parameter)> _bufferViewName = [];
 
     public NavigationService()
@@ -20,7 +20,7 @@ public NavigationService()
 
     }
 
-    public void RequestModuleNavigate(IModule module, NavigationParameters parameters)
+    public void RequestModuleNavigate(IModule module, NavigationParameters? parameters)
     {
         foreach (var handler in _handlers)
         {
@@ -31,7 +31,7 @@ public void RequestModuleNavigate(IModule module, NavigationParameters parameter
         }
         _bufferModule.Push((module, parameters));
     }
-    public void RequestModuleNavigate(string moduleName, NavigationParameters parameters)
+    public void RequestModuleNavigate(string moduleName, NavigationParameters? parameters)
     {
         foreach (var handler in _handlers)
         {

From e3f3508520f47b9e1198ffc64edf3b2a42a2668c Mon Sep 17 00:00:00 2001
From: Easley <nevermore.wd@me.com>
Date: Wed, 2 Apr 2025 16:44:14 +0800
Subject: [PATCH 14/15] rename

---
 .../Regions/Region.cs                         |  1 -
 .../ViewModels/MainViewModel.cs               |  2 +-
 .../MainWindowViewModel.cs                    |  2 +-
 .../Abstractions/IRegionManager.cs            | 15 ++++++++---
 src/Lemon.ModuleNavigation/ModuleManager.cs   |  4 +--
 .../NavigationHandler.cs                      |  6 ++---
 src/Lemon.ModuleNavigation/RegionManager.cs   | 25 ++++++++++++++++---
 7 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/Regions/Region.cs b/src/Lemon.ModuleNavigation.Avaloniaui/Regions/Region.cs
index d50f933..58377d5 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/Regions/Region.cs
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/Regions/Region.cs
@@ -1,6 +1,5 @@
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
-using Avalonia.Markup.Xaml.Templates;
 using Lemon.ModuleNavigation.Abstractions;
 using Lemon.ModuleNavigation.Core;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs b/src/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
index 9fa1598..f29c86b 100644
--- a/src/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
+++ b/src/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
@@ -104,7 +104,7 @@ await _dialogService.ShowDialog(content,
 
         UnloadViewCommand = ReactiveCommand.Create<NavigationContext>((context) =>
         {
-            _regionManager.RequestUnload(context);
+            _regionManager.RequestViewUnload(context);
         });
 
         _regionManager.NavigationSubscribe<NavigationContext>(n => 
diff --git a/src/Lemon.ModuleNavigation.WpfSample/MainWindowViewModel.cs b/src/Lemon.ModuleNavigation.WpfSample/MainWindowViewModel.cs
index 987bd8e..fea7e11 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/MainWindowViewModel.cs
+++ b/src/Lemon.ModuleNavigation.WpfSample/MainWindowViewModel.cs
@@ -82,7 +82,7 @@ await _dialogService.ShowDialog(content,
         });
         UnloadViewCommand = ReactiveCommand.Create<NavigationContext>((context) =>
         {
-            _regionManager.RequestUnload(context);
+            _regionManager.RequestViewUnload(context);
         });
     }
 
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs b/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs
index b6d7df3..bc855da 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs
@@ -2,13 +2,20 @@
 
 namespace Lemon.ModuleNavigation.Abstractions;
 
-public interface IRegionManager: IObservable<NavigationContext>, IObservable<IRegion>
+public interface IRegionManager : IObservable<NavigationContext>, IObservable<IRegion>
 {
     void AddRegion(string regionName, IRegion region);
     IRegion? GetRegion(string regionName);
-    void RequestNavigate(string regionName, string viewName, NavigationParameters? parameters = 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 RequestUnload(string regionName, string viewName);
-    void RequestUnload(NavigationContext context);
+    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);
+    void RequestModuleUnload(IModule module);
 }
diff --git a/src/Lemon.ModuleNavigation/ModuleManager.cs b/src/Lemon.ModuleNavigation/ModuleManager.cs
index d2b10d2..d156cb9 100644
--- a/src/Lemon.ModuleNavigation/ModuleManager.cs
+++ b/src/Lemon.ModuleNavigation/ModuleManager.cs
@@ -23,7 +23,7 @@ public ModuleManager(IEnumerable<IModule> modules,
         _regionCache = [];
         _modulesCache = new ConcurrentDictionary<string, IModule>(modules.ToDictionary(m => m.Key, m => m));
         Modules = _modulesCache.Values;
-        ActiveModules = new ObservableCollection<IModule>(_modulesCache
+        ActiveModules = [.. _modulesCache
         .Where(m =>
         {
             return !m.Value.LoadOnDemand;
@@ -32,7 +32,7 @@ public ModuleManager(IEnumerable<IModule> modules,
         {
             m.Value.Initialize();
             return m.Value;
-        }));
+        })];
     }
     public ObservableCollection<IModule> ActiveModules 
     { 
diff --git a/src/Lemon.ModuleNavigation/NavigationHandler.cs b/src/Lemon.ModuleNavigation/NavigationHandler.cs
index 1349a68..da2d2bb 100644
--- a/src/Lemon.ModuleNavigation/NavigationHandler.cs
+++ b/src/Lemon.ModuleNavigation/NavigationHandler.cs
@@ -35,18 +35,18 @@ public void OnNavigateTo(string moduleKey, NavigationParameters? parameters)
     public void OnNavigateTo(string regionName,
          string viewName)
     {
-        RegionManager.RequestNavigate(regionName, viewName, null);
+        RegionManager.RequestViewNavigate(regionName, viewName, null);
     }
     public void OnNavigateTo(string regionName,
         string viewName,
         NavigationParameters navigationParameters)
     {
-        RegionManager.RequestNavigate(regionName, viewName, navigationParameters);
+        RegionManager.RequestViewNavigate(regionName, viewName, navigationParameters);
     }
 
     public void OnViewUnload(string regionName, string viewName)
     {
-        RegionManager.RequestUnload(regionName, viewName);
+        RegionManager.RequestViewUnload(regionName, viewName);
     }
 
     void IDisposable.Dispose()
diff --git a/src/Lemon.ModuleNavigation/RegionManager.cs b/src/Lemon.ModuleNavigation/RegionManager.cs
index ff7a267..a26575d 100644
--- a/src/Lemon.ModuleNavigation/RegionManager.cs
+++ b/src/Lemon.ModuleNavigation/RegionManager.cs
@@ -41,7 +41,7 @@ public void RequestNavigate(string regionName, string viewName, bool requestNew,
                 });
         }
     }
-    public void RequestNavigate(string regionName, string viewName, NavigationParameters? parameters = null)
+    public void RequestViewNavigate(string regionName, string viewName, NavigationParameters? parameters = null)
     {
         var context = new NavigationContext(viewName, regionName, _serviceProvider, parameters);
         if (_regions.TryGetValue(regionName, out var region))
@@ -93,7 +93,7 @@ public void AddRegion(string regionName, IRegion region)
         return region;
     }
 
-    public void RequestUnload(string regionName, string viewName)
+    public void RequestViewUnload(string regionName, string viewName)
     {
         if (_regions.TryGetValue(regionName, out var region))
         {
@@ -104,7 +104,7 @@ public void RequestUnload(string regionName, string viewName)
             throw new RegionNameNotFoundException(nameof(regionName));
         }
     }
-    public void RequestUnload(NavigationContext navigationContext)
+    public void RequestViewUnload(NavigationContext navigationContext)
     {
         if (_regions.TryGetValue(navigationContext.RegionName, out var region))
         {
@@ -165,4 +165,23 @@ private void ToRegionsObservers(IRegion region)
         }
     }
 
+    public void RequestModuleNavigate(string regionName, string moduleName, NavigationParameters? parameters)
+    {
+        throw new NotImplementedException();
+    }
+
+    public void RequestModuleNavigate(string regionName, IModule module, NavigationParameters? parameters)
+    {
+        throw new NotImplementedException();
+    }
+
+    public void RequestModuleUnload(string moduleName, string viewName)
+    {
+        throw new NotImplementedException();
+    }
+
+    public void RequestModuleUnload(IModule module)
+    {
+        throw new NotImplementedException();
+    }
 }

From 8fbc3f24e576c5009f2f74da32072f0354f42f12 Mon Sep 17 00:00:00 2001
From: Easley <nevermore.wd@me.com>
Date: Wed, 2 Apr 2025 18:30:28 +0800
Subject: [PATCH 15/15] bump version 2.1.1-rc

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

diff --git a/src/Package.props b/src/Package.props
index 723e559..f0fa9df 100644
--- a/src/Package.props
+++ b/src/Package.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <Version>2.1.0-rc</Version>
+        <Version>2.1.1-rc</Version>
         <Authors>Easley</Authors>
         <RepositoryUrl>https://github.com/NeverMorewd/Lemon.ModuleNavigation</RepositoryUrl>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>