From a44391f4d59c8da84462a29c9c9fe52578c7e3e5 Mon Sep 17 00:00:00 2001
From: TheXamlGuy <dan_clark@outlook.com>
Date: Sun, 12 May 2024 12:22:04 +0100
Subject: [PATCH] Add support for self scope

---
 Toolkit.Foundation/ComponentBuilder.cs        |  3 +--
 Toolkit.Foundation/DefaultHostBuilder.cs      |  9 ++++---
 Toolkit.Foundation/NavigateHandler.cs         | 26 ++++++++++++-------
 .../ObservableCollectionViewModel.cs          | 12 +++++++--
 4 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/Toolkit.Foundation/ComponentBuilder.cs b/Toolkit.Foundation/ComponentBuilder.cs
index 4bb92d1..bc3ffdf 100644
--- a/Toolkit.Foundation/ComponentBuilder.cs
+++ b/Toolkit.Foundation/ComponentBuilder.cs
@@ -29,13 +29,12 @@ public class ComponentBuilder :
 
                 services.AddScoped<SubscriptionCollection>();
                 services.AddScoped<ISubscriptionManager, SubscriptionManager>();
+                services.AddScoped<IDisposer, Disposer>();
 
                 services.AddTransient<ISubscriber, Subscriber>();
                 services.AddTransient<IPublisher, Publisher>();
 
                 services.AddTransient<IMediator, Mediator>();
-                services.AddScoped<IDisposer, Disposer>();
-
                 services.AddTransient<INavigationScope, NavigationScope>();
 
                 services.AddTransient<INavigationProvider, NavigationProvider>();
diff --git a/Toolkit.Foundation/DefaultHostBuilder.cs b/Toolkit.Foundation/DefaultHostBuilder.cs
index e48a207..a65616e 100644
--- a/Toolkit.Foundation/DefaultHostBuilder.cs
+++ b/Toolkit.Foundation/DefaultHostBuilder.cs
@@ -24,11 +24,12 @@ public class DefaultHostBuilder :
                     ComponentHostCollection>();
 
                 services.AddScoped<SubscriptionCollection>();
-                services.AddScoped<ISubscriptionManager, SubscriptionManager>();
+                
+                services.AddTransient<ISubscriptionManager, SubscriptionManager>();
                 services.AddTransient<ISubscriber, Subscriber>();
-                services.AddTransient<IPublisher, Publisher>();
 
-                services.AddScoped<IMediator, Mediator>();
+                services.AddTransient<IPublisher, Publisher>();
+                services.AddTransient<IMediator, Mediator>();
 
                 services.AddScoped<IProxyService<IPublisher>>(provider =>
                     new ProxyService<IPublisher>(provider.GetRequiredService<IPublisher>()));
@@ -48,7 +49,7 @@ public class DefaultHostBuilder :
                 services.AddScoped<INavigationRegionCollection, NavigationRegionCollection>();
                 services.AddTransient<INavigationRegionProvider, NavigationRegionProvider>();
 
-                services.AddTransient<INavigationScope, NavigationScope>();
+                services.AddScoped<INavigationScope, NavigationScope>();
 
                 services.AddSingleton(new NamedComponent("Root"));
                 services.AddScoped<IComponentScopeCollection, ComponentScopeCollection>(provider => new ComponentScopeCollection
diff --git a/Toolkit.Foundation/NavigateHandler.cs b/Toolkit.Foundation/NavigateHandler.cs
index 9ee3d04..cb8b6c2 100644
--- a/Toolkit.Foundation/NavigateHandler.cs
+++ b/Toolkit.Foundation/NavigateHandler.cs
@@ -3,20 +3,28 @@
 namespace Toolkit.Foundation;
 
 public class NavigateHandler(NamedComponent scope,
-    IComponentScopeProvider provider) :
+    IComponentScopeProvider componentScopeProvider,
+    IServiceProvider provider) :
     INotificationHandler<Navigate>
 {
     public async Task Handle(Navigate args,
-        CancellationToken cancellationToken)
+      CancellationToken cancellationToken)
     {
-        if (provider.Get(args.Scope ?? scope.Name)
-            is ComponentScopeDescriptor descriptor)
+        INavigationScope? navigationScope;
+        if (args.Scope == "self")
         {
-            if (descriptor?.Services?.GetService<INavigationScope>() is INavigationScope navigationScope)
-            {
-                await navigationScope.NavigateAsync(args.Route, args.Sender,
-                    args.Context, args.Navigated, args.Parameters, cancellationToken);
-            }
+            navigationScope = provider.GetRequiredService<INavigationScope>();
+        }
+        else
+        {
+            ComponentScopeDescriptor? descriptor = componentScopeProvider.Get(args.Scope ?? scope.Name);
+            navigationScope = descriptor?.Services?.GetRequiredService<INavigationScope>();
+        }
+
+        if (navigationScope is not null)
+        {
+            await navigationScope.NavigateAsync(args.Route, args.Sender,
+                args.Context, args.Navigated, args.Parameters, cancellationToken);
         }
     }
 }
\ No newline at end of file
diff --git a/Toolkit.Foundation/ObservableCollectionViewModel.cs b/Toolkit.Foundation/ObservableCollectionViewModel.cs
index ff1748d..ffc1b0c 100644
--- a/Toolkit.Foundation/ObservableCollectionViewModel.cs
+++ b/Toolkit.Foundation/ObservableCollectionViewModel.cs
@@ -1,4 +1,5 @@
 using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.Extensions.DependencyInjection;
 using System.Collections;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
@@ -140,11 +141,18 @@ public partial class ObservableCollectionViewModel<TViewModel> :
         return item;
     }
 
-    public TViewModel Add<T>()
+    public TViewModel Add<T>(bool scope = false)
         where T :
         TViewModel
     {
-        T? item = Factory.Create<T>();
+        IServiceFactory? factory = null;
+        if (scope)
+        {
+            IServiceScope serviceScope = Provider.CreateScope();
+            factory = serviceScope.ServiceProvider.GetRequiredService<IServiceFactory>();
+        }
+
+        T? item = factory is not null ? factory.Create<T>() : Factory.Create<T>();
         Add(item);
 
         return item;