Add support for self scope

2024-05-12 12:22:04 +01:00
parent 1dc4da48bb
commit a44391f4d5
4 changed files with 33 additions and 17 deletions
@@ -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);
        }
    }
 }