Remove extra instance

shinyorg · Apr 21, 2024 · 1b5c7ee · 1b5c7ee
1 parent fb80c44
commit 1b5c7ee
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/Shiny.Core/ServiceProviderExtensions.cs b/src/Shiny.Core/ServiceProviderExtensions.cs
@@ -84,21 +84,19 @@ public static IServiceCollection AddShinyService(this IServiceCollection service
             .Where(x => x != typeof(IDisposable))
             .ToList();
 
-        services.AddSingleton(implementationType);
-
         if (interfaces.Any(x => x == typeof(INotifyPropertyChanged)) || interfaces.Any(x => x == typeof(IShinyComponentStartup)))
         {
-            services.AddSingleton(implementationType, services =>
+            services.AddSingleton(implementationType, sp =>
             {
-                var logger = services.GetRequiredService<ILoggerFactory>().CreateLogger("ShinyStartup");
-                var instance = ActivatorUtilities.CreateInstance(services, implementationType);
+                var logger = sp.GetRequiredService<ILoggerFactory>().CreateLogger("ShinyStartup");
+                var instance = ActivatorUtilities.CreateInstance(sp, implementationType);
                 var fn = implementationType.FullName;
 
                 if (instance is INotifyPropertyChanged npc)
                 {
                     logger.LogInformation("Startup Binding for " + fn);
 
-                    services
+                    sp
                         .GetRequiredService<IObjectStoreBinder>()
                         .Bind(npc);
                 }
@@ -113,6 +111,10 @@ public static IServiceCollection AddShinyService(this IServiceCollection service
             interfaces.Remove(typeof(INotifyPropertyChanged));
             interfaces.Remove(typeof(IShinyComponentStartup));
         }
+        else
+        {
+            services.AddSingleton(implementationType);
+        }
         foreach (var iface in interfaces)
         { 
             services.AddSingleton(iface, sp => sp.GetRequiredService(implementationType));