Add IComponentActivator

Author: stsrki

src/Components/Components/src/ComponentFactory.cs

@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Reflection;
 using Microsoft.AspNetCore.Components.Reflection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNetCore.Components
 {
@@ -25,7 +26,12 @@ private readonly ConcurrentDictionary<Type, Action<IServiceProvider, IComponent>
 
         public IComponent InstantiateComponent(IServiceProvider serviceProvider, Type componentType)
         {
-            var instance = Activator.CreateInstance(componentType);
+            var activator = serviceProvider.GetService<IComponentActivator>();
+
+            var instance = activator != null
+                ? activator.CreateInstance(componentType)
+                : Activator.CreateInstance(componentType);
+
             if (!(instance is IComponent component))
             {
                 throw new ArgumentException($"The type {componentType.FullName} does not implement {nameof(IComponent)}.", nameof(componentType));

src/Components/Components/src/DefaultComponentActivator.cs

@@ -0,0 +1,19 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Components
+{
+    /// <summary>
+    /// Default implementation of component activator.
+    /// </summary>
+    public class DefaultComponentActivator : IComponentActivator
+    {
+        /// <inheritdoc />
+        public IComponent? CreateInstance(Type componentType)
+        {
+            return Activator.CreateInstance(componentType) as IComponent;
+        }
+    }
+}

src/Components/Components/src/IComponentActivator.cs

@@ -0,0 +1,20 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Components
+{
+    /// <summary>
+    /// Represents an activator that can be used to instantiate components.
+    /// </summary>
+    public interface IComponentActivator
+    {
+        /// <summary>
+        /// Creates an component of the specified type using that type's default constructor.
+        /// </summary>
+        /// <param name="componentType">The type of component to create.</param>
+        /// <returns>A reference to the newly created component.</returns>
+        IComponent? CreateInstance(Type componentType);
+    }
+}

src/Components/Components/test/ComponentFactoryTest.cs

@@ -27,6 +27,32 @@ public void InstantiateComponent_CreatesInstance()
             Assert.IsType<EmptyComponent>(instance);
         }
 
+        [Fact]
+        public void InstantiateComponent_CreatesInstance_WithActivator()
+        {
+            // Arrange
+            var componentType = typeof(EmptyComponent);
+            var factory = new ComponentFactory();
+
+            // Act
+            var instance = factory.InstantiateComponent(GetServiceProviderWithActivator(), componentType);
+
+            // Assert
+            Assert.NotNull(instance);
+            Assert.IsType<EmptyComponent>(instance);
+        }
+
+        [Fact]
+        public void InstantiateComponent_CreatesInstance_WithActivator_NonComponent()
+        {
+            // Arrange
+            var componentType = typeof(NonComponent);
+            var factory = new ComponentFactory();
+
+            // Assert
+            Assert.Throws<ArgumentException>(()=>factory.InstantiateComponent(GetServiceProviderWithActivator(), componentType));
+        }
+
         [Fact]
         public void InstantiateComponent_AssignsPropertiesWithInjectAttribute()
         {
@@ -96,6 +122,15 @@ private static IServiceProvider GetServiceProvider()
                 .BuildServiceProvider();
         }
 
+        private static IServiceProvider GetServiceProviderWithActivator()
+        {
+            return new ServiceCollection()
+                .AddTransient<TestService1>()
+                .AddTransient<TestService2>()
+                .AddSingleton<IComponentActivator, DefaultComponentActivator>()
+                .BuildServiceProvider();
+        }
+
         private class EmptyComponent : IComponent
         {
             public void Attach(RenderHandle renderHandle)
@@ -162,6 +197,8 @@ private class DerivedComponent : ComponentWithInjectProperties
             public TestService2 Property5 { get; set; }
         }
 
+        private class NonComponent { }
+
         public class TestService1 { }
         public class TestService2 { }
     }

src/Components/Server/src/DependencyInjection/ComponentServiceCollectionExtensions.cs

@@ -74,6 +74,7 @@ public static IServerSideBlazorBuilder AddServerSideBlazor(this IServiceCollecti
             services.AddScoped<IJSRuntime, RemoteJSRuntime>();
             services.AddScoped<INavigationInterception, RemoteNavigationInterception>();
             services.AddScoped<AuthenticationStateProvider, ServerAuthenticationStateProvider>();
+            services.AddScoped<IComponentActivator, DefaultComponentActivator>();
 
             services.TryAddEnumerable(ServiceDescriptor.Singleton<IConfigureOptions<CircuitOptions>, CircuitOptionsJSInteropDetailedErrorsConfiguration>());
 

src/Mvc/Mvc.ViewFeatures/src/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs

@@ -212,12 +212,13 @@ internal static void AddViewServices(IServiceCollection services)
             services.TryAddScoped<NavigationManager, HttpNavigationManager>();
             services.TryAddScoped<IJSRuntime, UnsupportedJavaScriptRuntime>();
             services.TryAddScoped<INavigationInterception, UnsupportedNavigationInterception>();
-
+            
             services.TryAddTransient<ControllerSaveTempDataPropertyFilter>();
 
             // This does caching so it should stay singleton
             services.TryAddSingleton<ITempDataProvider, CookieTempDataProvider>();
             services.TryAddSingleton<TempDataSerializer, DefaultTempDataSerializer>();
+            services.TryAddSingleton<IComponentActivator, DefaultComponentActivator>();
 
             //
             // Antiforgery