fixup

pranavkm · pranavkm · commit 79a1769e47ac · 2019-10-11T13:46:45.000-07:00
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/ComponentWithParametersTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/ComponentWithParametersTest.cs
@@ -27,7 +27,7 @@ public ComponentWithParametersTest(
         }
 
         [Fact]
-        public void PassingParametersToComponentsWorks()
+        public void PassingParametersToComponentsFromThePageWorks()
         {
             Navigate("/prerendered/componentwithparameters?QueryValue=testQueryValue");
 
diff --git a/src/Components/test/testassets/TestServer/Pages/MultipleComponents.cshtml b/src/Components/test/testassets/TestServer/Pages/MultipleComponents.cshtml
@@ -10,8 +10,8 @@
 </head>
 <body>
     <div id="test-container">
-        <component type="typeof(GreeterComponent)" render-mode="ServerPrerendered" />
-        <component type="typeof(GreeterComponent)" render-mode="Server" />
+        @(await Html.RenderComponentAsync<GreeterComponent>(RenderMode.ServerPrerendered))
+        @(await Html.RenderComponentAsync<GreeterComponent>(RenderMode.Server))
         <component type="typeof(GreeterComponent)" render-mode="Static" param-name='"John"' />
         <component type="typeof(GreeterComponent)" render-mode="Server"/>
         <div id="container">
diff --git a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.netcoreapp.cs b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.netcoreapp.cs
@@ -324,6 +324,7 @@ public enum Html5DateRenderingMode
     }
     public static partial class HtmlHelperComponentExtensions
     {
+        public static System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.IHtmlContent> RenderComponentAsync(this Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper, System.Type componentType, Microsoft.AspNetCore.Mvc.Rendering.RenderMode renderMode, object parameters) { throw null; }
         public static System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.IHtmlContent> RenderComponentAsync<TComponent>(this Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper, Microsoft.AspNetCore.Mvc.Rendering.RenderMode renderMode) where TComponent : Microsoft.AspNetCore.Components.IComponent { throw null; }
         public static System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.IHtmlContent> RenderComponentAsync<TComponent>(this Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper, Microsoft.AspNetCore.Mvc.Rendering.RenderMode renderMode, object parameters) where TComponent : Microsoft.AspNetCore.Components.IComponent { throw null; }
     }
diff --git a/src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperComponentExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/HtmlHelperComponentExtensions.cs
@@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
     public static class HtmlHelperComponentExtensions
     {
         /// <summary>
-        /// Renders the <typeparamref name="TComponent"/> <see cref="IComponent"/>.
+        /// Renders the <typeparamref name="TComponent"/>.
         /// </summary>
         /// <param name="htmlHelper">The <see cref="IHtmlHelper"/>.</param>
         /// <param name="renderMode">The <see cref="RenderMode"/> for the component.</param>
@@ -25,7 +25,7 @@ public static Task<IHtmlContent> RenderComponentAsync<TComponent>(this IHtmlHelp
             => RenderComponentAsync<TComponent>(htmlHelper, renderMode, parameters: null);
 
         /// <summary>
-        /// Renders the <typeparamref name="TComponent"/> <see cref="IComponent"/>.
+        /// Renders the <typeparamref name="TComponent"/>.
         /// </summary>
         /// <param name="htmlHelper">The <see cref="IHtmlHelper"/>.</param>
         /// <param name="parameters">An <see cref="object"/> containing the parameters to pass
@@ -36,15 +36,35 @@ public static Task<IHtmlContent> RenderComponentAsync<TComponent>(
             this IHtmlHelper htmlHelper,
             RenderMode renderMode,
             object parameters) where TComponent : IComponent
+            => RenderComponentAsync(htmlHelper, typeof(TComponent), renderMode, parameters);
+
+        /// <summary>
+        /// Renders the specified <paramref name="componentType"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/>.</param>
+        /// <param name="componentType">The component type.</param>
+        /// <param name="parameters">An <see cref="object"/> containing the parameters to pass
+        /// to the component.</param>
+        /// <param name="renderMode">The <see cref="RenderMode"/> for the component.</param>
+        public static Task<IHtmlContent> RenderComponentAsync(
+            this IHtmlHelper htmlHelper,
+            Type componentType,
+            RenderMode renderMode,
+            object parameters)
         {
             if (htmlHelper is null)
             {
                 throw new ArgumentNullException(nameof(htmlHelper));
             }
 
+            if (componentType is null)
+            {
+                throw new ArgumentNullException(nameof(componentType));
+            }
+
             var viewContext = htmlHelper.ViewContext;
             var componentRenderer = viewContext.HttpContext.RequestServices.GetRequiredService<IComponentRenderer>();
-            return componentRenderer.RenderComponentAsync(viewContext, typeof(TComponent), renderMode, parameters);
+            return componentRenderer.RenderComponentAsync(viewContext, componentType, renderMode, parameters);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public ComponentWithParametersTest(`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`[Fact]`
`30`		`- public void PassingParametersToComponentsWorks()`
	`30`	`+ public void PassingParametersToComponentsFromThePageWorks()`
`31`	`31`	`{`
`32`	`32`	`Navigate("/prerendered/componentwithparameters?QueryValue=testQueryValue");`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -324,6 +324,7 @@ public enum Html5DateRenderingMode`
`324`	`324`	`}`
`325`	`325`	`public static partial class HtmlHelperComponentExtensions`
`326`	`326`	`{`
	`327`	`+ public static System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.IHtmlContent> RenderComponentAsync(this Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper, System.Type componentType, Microsoft.AspNetCore.Mvc.Rendering.RenderMode renderMode, object parameters) { throw null; }`
`327`	`328`	`public static System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.IHtmlContent> RenderComponentAsync<TComponent>(this Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper, Microsoft.AspNetCore.Mvc.Rendering.RenderMode renderMode) where TComponent : Microsoft.AspNetCore.Components.IComponent { throw null; }`
`328`	`329`	`public static System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.IHtmlContent> RenderComponentAsync<TComponent>(this Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper, Microsoft.AspNetCore.Mvc.Rendering.RenderMode renderMode, object parameters) where TComponent : Microsoft.AspNetCore.Components.IComponent { throw null; }`
`329`	`330`	`}`