Fixed more edge cases

2024-05-16 21:41:48 +01:00
parent 8c0436644a
commit 7f3c4c53cc
16 changed files with 93 additions and 33 deletions
@@ -3,16 +3,15 @@
 namespace Toolkit.Foundation;

 public class NavigateHandler(NamedComponent scope,
-    IComponentScopeProvider componentScopeProvider,
-    IServiceProvider provider) :
+    IComponentScopeProvider componentScopeProvider) :
    INotificationHandler<NavigateEventArgs>
 {
    public Task Handle(NavigateEventArgs args)
    {
        INavigationScope? navigationScope;
-        if (args.Scope == "self")
+        if (args.Scope == "self" && args.Sender is IServiceProviderRequired requireServiceProvider)
        {
-            navigationScope = provider.GetRequiredService<INavigationScope>();
+             navigationScope = requireServiceProvider.Provider.GetRequiredService<INavigationScope>();
        }
        else
        {