diff --git a/Framework/Avalonia/Extensions/IServiceCollectionExtensions.cs b/Framework/Avalonia/Extensions/IServiceCollectionExtensions.cs index 6be1022..dd0f99e 100644 --- a/Framework/Avalonia/Extensions/IServiceCollectionExtensions.cs +++ b/Framework/Avalonia/Extensions/IServiceCollectionExtensions.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.DependencyInjection.Extensions; using Toolkit.Framework.Foundation; namespace Toolkit.Foundation.Avalonia -{ +{ public static class IServiceCollectionExtensions { public static IServiceCollection AddNavigation(this IServiceCollection serviceCollection) @@ -19,4 +19,4 @@ namespace Toolkit.Foundation.Avalonia return serviceCollection; } } -} +} \ No newline at end of file diff --git a/Framework/Avalonia/Markups/NavigateExtension.cs b/Framework/Avalonia/Markups/NavigateExtension.cs index 3ea6d5a..296ed89 100644 --- a/Framework/Avalonia/Markups/NavigateExtension.cs +++ b/Framework/Avalonia/Markups/NavigateExtension.cs @@ -408,7 +408,6 @@ public class NavigateExtension : TriggerExtension routeBinding = route.ToBinding(); } } - } protected override void OnInvoked(object sender, EventArgs args) @@ -438,9 +437,11 @@ public class NavigateExtension : TriggerExtension parameters.Add(keyValuePair); } break; + case IEventParameter eventParameter: parameters.AddRange(eventParameter.GetValues(args)); break; + default: if (parameter.ToBinding() is Binding defaultDinding) { @@ -475,7 +476,6 @@ public class NavigateExtension : TriggerExtension } } } - } base.OnInvoked(sender, args); diff --git a/Framework/Avalonia/Navigation/NavigationPageFactory.cs b/Framework/Avalonia/Navigation/NavigationPageFactory.cs index 4a0d935..734a322 100644 --- a/Framework/Avalonia/Navigation/NavigationPageFactory.cs +++ b/Framework/Avalonia/Navigation/NavigationPageFactory.cs @@ -1,5 +1,5 @@ -using FluentAvalonia.UI.Controls; -using Avalonia.Controls; +using Avalonia.Controls; +using FluentAvalonia.UI.Controls; namespace Toolkit.Foundation.Avalonia; @@ -14,4 +14,4 @@ internal class NavigationPageFactory : INavigationPageFactory { return (IControl)target; } -} +} \ No newline at end of file diff --git a/Framework/Avalonia/Navigation/NavigationRouteHandler.cs b/Framework/Avalonia/Navigation/NavigationRouteHandler.cs index 25560e4..3a7d7bd 100644 --- a/Framework/Avalonia/Navigation/NavigationRouteHandler.cs +++ b/Framework/Avalonia/Navigation/NavigationRouteHandler.cs @@ -36,4 +36,4 @@ public class NavigationRouteHandler : IRequestHandler descriptors.Add(new NavigationRouteDescriptor(request.Name, request.Route)); return default; } -} +} \ No newline at end of file diff --git a/Framework/Foundation/Configurations/ConfigurationWriter.cs b/Framework/Foundation/Configurations/ConfigurationWriter.cs index e982577..215fde5 100644 --- a/Framework/Foundation/Configurations/ConfigurationWriter.cs +++ b/Framework/Foundation/Configurations/ConfigurationWriter.cs @@ -1,6 +1,4 @@ using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; namespace Toolkit.Framework.Foundation; @@ -26,4 +24,4 @@ public class ConfigurationWriter : IConfigurationWriter