Change ViewComponent.View() to flow the ViewData.Model.

- This is more consistent with how controllers work. #4882
aspnet · Aug 25, 2016 · 7036e2b · 7036e2b
1 parent c942eab
commit 7036e2b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Controller.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Controller.cs
@@ -138,7 +138,6 @@ public virtual ViewResult View(object model)
         [NonAction]
         public virtual ViewResult View(string viewName, object model)
         {
-            // Do not override ViewData.Model unless passed a non-null value.
             if (model != null)
             {
                 ViewData.Model = model;
@@ -195,7 +194,6 @@ public virtual PartialViewResult PartialView(object model)
         [NonAction]
         public virtual PartialViewResult PartialView(string viewName, object model)
         {
-            // Do not override ViewData.Model unless passed a non-null value.
             if (model != null)
             {
                 ViewData.Model = model;

diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponent.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponent.cs
@@ -262,7 +262,12 @@ public ViewViewComponentResult View<TModel>(TModel model)
         /// <returns>A <see cref="ViewViewComponentResult"/>.</returns>
         public ViewViewComponentResult View<TModel>(string viewName, TModel model)
         {
-            var viewData = new ViewDataDictionary<TModel>(ViewData, model);
+            if (model != null)
+            {
+                ViewData.Model = model;
+            }
+
+            var viewData = new ViewDataDictionary<TModel>(ViewData);
             return new ViewViewComponentResult
             {
                 ViewEngine = ViewEngine,

diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponentTests.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponentTests.cs
@@ -82,6 +82,25 @@ public void ViewComponent_View_WithEmptyParameter_SetsResultViewWithDefaultViewN
             Assert.Null(actualResult.ViewName);
         }
 
+        [Fact]
+        public void ViewComponent_View_WithEmptyParameter_SetsViewDataModelWithDefaultViewName()
+        {
+            // Arrange
+            var viewComponent = new TestViewComponent();
+            var model = new object();
+            viewComponent.ViewData.Model = model;
+
+            // Act
+            var actualResult = viewComponent.View();
+
+            // Assert
+            Assert.IsType<ViewViewComponentResult>(actualResult);
+            Assert.NotSame(viewComponent.ViewData, actualResult.ViewData);
+            Assert.Equal(new ViewDataDictionary<object>(viewComponent.ViewData), actualResult.ViewData);
+            Assert.Same(model, actualResult.ViewData.Model);
+            Assert.Null(actualResult.ViewName);
+        }
+
         [Fact]
         public void ViewComponent_View_WithViewNameParameter_SetsResultViewWithCustomViewName()
         {