Updated an validated modals to be working

mitchelsellers · mitchelsellers · commit bc7524f90a55 · 2023-01-11T01:33:53.000-06:00
diff --git a/src/AspNetCore.Utilities.Bootstrap5TagHelpers.Sample/Views/Home/Index.cshtml b/src/AspNetCore.Utilities.Bootstrap5TagHelpers.Sample/Views/Home/Index.cshtml
@@ -344,7 +344,7 @@
                         <form-input asp-for="FirstName"></form-input>
                     </modal-body>
                     <modal-footer>
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+                        <bs-button bs-color="Secondary" dismisses="modal">Close</bs-button>
                     </modal-footer>
                 </modal>
             </td>
diff --git a/src/AspNetCore.Utilities.Bootstrap5TagHelpers.Tests/ButtonTagHelperTests.cs b/src/AspNetCore.Utilities.Bootstrap5TagHelpers.Tests/ButtonTagHelperTests.cs
@@ -109,10 +109,9 @@ public async Task Throws_Error_If_Invalid_ButtonSize()
     }
 
     [Fact]
-    public async Task Adds_Class_If_Block_Button()
+    public async Task Adds_Attribute_If_Dismisses_Has_Value()
     {
-        var output = await (new ButtonTagHelper() { Block=true }).Render();
-        output.AssertContainsClass("btn-block");
+        var output = await (new ButtonTagHelper() { Dismisses = "modal"}).Render();
         await VerifyTagHelper(output);
     }
 
diff --git a/src/AspNetCore.Utilities.Bootstrap5TagHelpers.Tests/Modal/ModalHeaderDismissTagHelperTests.cs b/src/AspNetCore.Utilities.Bootstrap5TagHelpers.Tests/Modal/ModalHeaderDismissTagHelperTests.cs
@@ -22,8 +22,8 @@ public void Should_Render_As_Button()
 
     [Theory]
     [InlineData("aria-label", "Close")]
-    [InlineData("data-dismiss", "modal")]
-    [InlineData("class", "close")]
+    [InlineData("data-bs-dismiss", "modal")]
+    [InlineData("class", "btn-close")]
     [InlineData("type", "button")]
     public void Should_Set_Needed_Attributes(string expectedAttribute, string expectedValue)
     {
diff --git a/src/AspNetCore.Utilities.Bootstrap5TagHelpers.Tests/Modal/ModalHeaderTagHelperTests.cs b/src/AspNetCore.Utilities.Bootstrap5TagHelpers.Tests/Modal/ModalHeaderTagHelperTests.cs
@@ -105,8 +105,8 @@ public async Task Should_NotRender_InnerContent_When_Title_Missing()
     }
 
     [Theory]
-    [InlineData("My Title", "", "<h5 class=\"modal-title\">My Title</h5>")]
-    [InlineData("My Title", "myModal", "<h5 class=\"modal-title\" id=\"myModalLabel\">My Title</h5>")]
+    [InlineData("My Title", "", "<h2 class=\"modal-title fs-5\">My Title</h2>")]
+    [InlineData("My Title", "myModal", "<h2 class=\"modal-title fs-5\" id=\"myModalLabel\">My Title</h2>")]
     public async Task Should_Render_InnerContent_Title_When_Title_Provided(string title, string id, string expectedHtml)
     {
         //Arrange
@@ -121,4 +121,24 @@ public async Task Should_Render_InnerContent_Title_When_Title_Provided(string ti
         //Assert
         Assert.Equal(expectedHtml, output.Content.GetContent());
     }
+
+    [Theory]
+    [InlineData("My Title", "", "", "<h2 class=\"modal-title fs-5\">My Title</h2>")]
+    [InlineData("My Title", "myModal", "h5", "<h5 class=\"modal-title fs-5\" id=\"myModalLabel\">My Title</h5>")]
+    public async Task Should_Render_InnerContent_Title_WithCustomTag_When_Title_Provided(string title, string id, string tag, string expectedHtml)
+    {
+        //Arrange
+        TagHelperContext context = MakeTagHelperContext();
+        context.Items.Add(typeof(ModalContext), new ModalContext { Id = id });
+        TagHelperOutput output = MakeTagHelperOutput(" ");
+        
+        //Act
+        var helper = new ModalHeaderTagHelper { Title = title };
+        if (!string.IsNullOrEmpty(tag))
+            helper.TitleTag = tag;
+        await helper.ProcessAsync(context, output);
+
+        //Assert
+        Assert.Equal(expectedHtml, output.Content.GetContent());
+    }
 }
diff --git a/src/AspNetCore.Utilities.Bootstrap5TagHelpers.Tests/Modal/ModalTagHelperTests.cs b/src/AspNetCore.Utilities.Bootstrap5TagHelpers.Tests/Modal/ModalTagHelperTests.cs
@@ -120,7 +120,7 @@ public async Task Should_Render_Static_Backdrop_Attribute_When_Flagged(bool stat
         string expectedAttributeValue)
     {
         //Arrange
-        var attributeName = "data-backdrop";
+        var attributeName = "data-bs-backdrop";
         TagHelperContext context = MakeTagHelperContext();
         TagHelperOutput output = MakeTagHelperOutput(" ");
 
diff --git a/src/AspNetCore.Utilities.Bootstrap5TagHelpers.Tests/Modal/ModalToggleTagHelperTests.cs b/src/AspNetCore.Utilities.Bootstrap5TagHelpers.Tests/Modal/ModalToggleTagHelperTests.cs
@@ -62,7 +62,7 @@ public void Should_Render_DataToggle_Attribute()
         helper.Process(context, output);
 
         //Assert
-        Assert.Equal("modal", output.Attributes["data-toggle"].Value);
+        Assert.Equal("modal", output.Attributes["data-bs-toggle"].Value);
     }
 
     [Fact]
@@ -77,7 +77,7 @@ public void Should_Render_DataTarget_Attribute()
         helper.Process(context, output);
 
         //Assert
-        Assert.Equal("#testTarget", output.Attributes["data-target"].Value);
+        Assert.Equal("#testTarget", output.Attributes["data-bs-target"].Value);
     }
 
     [Fact]
diff --git a/src/AspNetCore.Utilities.Bootstrap5TagHelpers.Tests/VerifySnapshots/ButtonTagHelperTests.Adds_Attribute_If_Dismisses_Has_Value.verified.html b/src/AspNetCore.Utilities.Bootstrap5TagHelpers.Tests/VerifySnapshots/ButtonTagHelperTests.Adds_Attribute_If_Dismisses_Has_Value.verified.html
@@ -0,0 +1,2 @@
+﻿
+<button type="HtmlEncode[[button]]" class="btn btn-info" role="HtmlEncode[[button]]" data-bs-dismiss="HtmlEncode[[modal]]"></button>
diff --git a/src/AspNetCore.Utilities.Bootstrap5TagHelpers/ButtonTagHelper.cs b/src/AspNetCore.Utilities.Bootstrap5TagHelpers/ButtonTagHelper.cs
@@ -87,9 +87,9 @@ public class ButtonTagHelper : TagHelper
     public bool Disabled { get; set; }
 
     /// <summary>
-    ///     Is this a block level button
+    /// If a value is provided this 
     /// </summary>
-    public bool Block { get; set; }
+    public string? Dismisses { get; set; }
 
     /// <summary>
     ///     The size of this button
@@ -134,9 +134,9 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu
             }, HtmlEncoder.Default);
         }
 
-        if (Block)
+        if (!string.IsNullOrEmpty(Dismisses))
         {
-            output.AddClass("btn-block", HtmlEncoder.Default);
+            output.Attributes.Add("data-bs-dismiss", Dismisses);
         }
 
         TagHelperContent? content = await output.GetChildContentAsync();
diff --git a/src/AspNetCore.Utilities.Bootstrap5TagHelpers/Card/CardBodyTagHelper.cs b/src/AspNetCore.Utilities.Bootstrap5TagHelpers/Card/CardBodyTagHelper.cs
@@ -8,6 +8,7 @@ namespace ICG.AspNetCore.Utilities.Bootstrap5TagHelpers.Card
     /// <summary>
     /// Tag Helper for the body of a Card
     /// </summary>
+    [HtmlTargetElement("card-body", ParentTag = "card")]
     public class CardBodyTagHelper : TagHelper
     {
         /// <summary>
diff --git a/src/AspNetCore.Utilities.Bootstrap5TagHelpers/Card/CardFooterTagHelper.cs b/src/AspNetCore.Utilities.Bootstrap5TagHelpers/Card/CardFooterTagHelper.cs
@@ -8,6 +8,7 @@ namespace ICG.AspNetCore.Utilities.Bootstrap5TagHelpers.Card;
 /// <summary>
 ///     Tag Helper for rendering the header for a card
 /// </summary>
+[HtmlTargetElement("card-footer", ParentTag = "card")]
 public class CardFooterTagHelper : TagHelper
 {
     /// <summary>
diff --git a/src/AspNetCore.Utilities.Bootstrap5TagHelpers/Card/CardHeaderTagHelper.cs b/src/AspNetCore.Utilities.Bootstrap5TagHelpers/Card/CardHeaderTagHelper.cs
@@ -10,6 +10,7 @@ namespace ICG.AspNetCore.Utilities.Bootstrap5TagHelpers.Card
     /// <summary>
     /// Tag Helper for rendering the header for a card
     /// </summary>
+    [HtmlTargetElement("card-header", ParentTag = "card")]
     public class CardHeaderTagHelper : TagHelper
     {
         /// <summary>
diff --git a/src/AspNetCore.Utilities.Bootstrap5TagHelpers/Modal/ModalHeaderDismissTagHelper.cs b/src/AspNetCore.Utilities.Bootstrap5TagHelpers/Modal/ModalHeaderDismissTagHelper.cs
@@ -1,6 +1,4 @@
-﻿using Microsoft.AspNetCore.Html;
-using Microsoft.AspNetCore.Mvc.Rendering;
-using Microsoft.AspNetCore.Mvc.TagHelpers;
+﻿using Microsoft.AspNetCore.Mvc.TagHelpers;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using System.Text.Encodings.Web;
 
@@ -20,13 +18,9 @@ public class ModalHeaderDismissTagHelper : TagHelper
     public override void Process(TagHelperContext context, TagHelperOutput output)
     {
         output.TagName = "button";
-        output.Attributes.Add("aria-label", "Close");
-        output.Attributes.Add("data-dismiss", "modal");
-        output.AddClass("close", HtmlEncoder.Default);
+        output.Attributes.Add("data-bs-dismiss", "modal");
+        output.AddClass("btn-close", HtmlEncoder.Default);
         output.Attributes.Add("type", "button");
-        var icon = new TagBuilder("span");
-        icon.Attributes.Add("aria-hidden", "true");
-        icon.InnerHtml.SetHtmlContent("&times;");
-        output.Content.AppendHtml(icon);
+        output.Attributes.Add("aria-label", "Close");
     }
 }
diff --git a/src/AspNetCore.Utilities.Bootstrap5TagHelpers/Modal/ModalHeaderTagHelper.cs b/src/AspNetCore.Utilities.Bootstrap5TagHelpers/Modal/ModalHeaderTagHelper.cs
@@ -11,13 +11,19 @@ namespace ICG.AspNetCore.Utilities.Bootstrap5TagHelpers.Modal;
 /// <summary>
 ///     Renders a modal header content
 /// </summary>
+[HtmlTargetElement("modal-header", ParentTag = "modal")]
 public class ModalHeaderTagHelper : TagHelper
 {
     /// <summary>
     ///     The optional title to render for this particular title
     /// </summary>
     public string Title { get; set; }
 
+    /// <summary>
+    /// The title tag to be utilized
+    /// </summary>
+    public string TitleTag { get; set; } = "h2";
+
     /// <summary>
     ///     Completes the actual rendering of the Tag helper
     /// </summary>
@@ -44,8 +50,8 @@ private async Task ProcessAsyncInternal(TagHelperOutput output, ModalContext mod
         //Add the title
         if (!string.IsNullOrEmpty(Title))
         {
-            var titleTag = new TagBuilder("h5");
-            titleTag.Attributes.Add("class", "modal-title");
+            var titleTag = new TagBuilder(TitleTag);
+            titleTag.Attributes.Add("class", "modal-title fs-5");
             if(!string.IsNullOrEmpty(modalContext.Id))
                 titleTag.Attributes.Add("id", $"{modalContext.Id}Label");
             titleTag.InnerHtml.Append(Title);
diff --git a/src/AspNetCore.Utilities.Bootstrap5TagHelpers/Modal/ModalTagHelper.cs b/src/AspNetCore.Utilities.Bootstrap5TagHelpers/Modal/ModalTagHelper.cs
@@ -47,10 +47,10 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu
         
         if(!string.IsNullOrEmpty(id))
             output.Attributes.Add("aria-labelledby", $"{id}Label");
-
+        output.Attributes.Add("aria-hidden", "true");
         if (StaticBackdrop)
-            output.Attributes.Add("data-backdrop", "static");
-
+            output.Attributes.Add("data-bs-backdrop", "static");
+        output.Attributes.Add("tabindex", "-1");
         var dialogWrapper = new TagBuilder("div");
         dialogWrapper.AddCssClass("modal-dialog");
         var dialogContent = new TagBuilder("div");
diff --git a/src/AspNetCore.Utilities.Bootstrap5TagHelpers/Modal/ModalToggleTagHelper.cs b/src/AspNetCore.Utilities.Bootstrap5TagHelpers/Modal/ModalToggleTagHelper.cs
@@ -32,8 +32,8 @@ public class ModalToggleTagHelper : TagHelper
     public override void Process(TagHelperContext context, TagHelperOutput output)
     {
         output.TagName = TagName;
-        output.Attributes.Add("data-toggle", "modal");
-        output.Attributes.Add("data-target", $"#{Target}");
+        output.Attributes.Add("data-bs-toggle", "modal");
+        output.Attributes.Add("data-bs-target", $"#{Target}");
         output.AddClass("btn", HtmlEncoder.Default);
         output.AddClass($"btn-{ToggleColor.ToString().ToLower()}", HtmlEncoder.Default);
 

Original file line number	Diff line number	Diff line change
`@@ -109,10 +109,9 @@ public async Task Throws_Error_If_Invalid_ButtonSize()`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`[Fact]`
`112`		`- public async Task Adds_Class_If_Block_Button()`
	`112`	`+ public async Task Adds_Attribute_If_Dismisses_Has_Value()`
`113`	`113`	`{`
`114`		`- var output = await (new ButtonTagHelper() { Block=true }).Render();`
`115`		`- output.AssertContainsClass("btn-block");`
	`114`	`+ var output = await (new ButtonTagHelper() { Dismisses = "modal"}).Render();`
`116`	`115`	`await VerifyTagHelper(output);`
`117`	`116`	`}`
`118`	`117`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public async Task Should_Render_Static_Backdrop_Attribute_When_Flagged(bool stat`
`120`	`120`	`string expectedAttributeValue)`
`121`	`121`	`{`
`122`	`122`	`//Arrange`
`123`		`- var attributeName = "data-backdrop";`
	`123`	`+ var attributeName = "data-bs-backdrop";`
`124`	`124`	`TagHelperContext context = MakeTagHelperContext();`
`125`	`125`	`TagHelperOutput output = MakeTagHelperOutput(" ");`
`126`	`126`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public void Should_Render_DataToggle_Attribute()`
`62`	`62`	`helper.Process(context, output);`
`63`	`63`
`64`	`64`	`//Assert`
`65`		`- Assert.Equal("modal", output.Attributes["data-toggle"].Value);`
	`65`	`+ Assert.Equal("modal", output.Attributes["data-bs-toggle"].Value);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`[Fact]`
`@@ -77,7 +77,7 @@ public void Should_Render_DataTarget_Attribute()`
`77`	`77`	`helper.Process(context, output);`
`78`	`78`
`79`	`79`	`//Assert`
`80`		`- Assert.Equal("#testTarget", output.Attributes["data-target"].Value);`
	`80`	`+ Assert.Equal("#testTarget", output.Attributes["data-bs-target"].Value);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+`
	`2`	`+<button type="HtmlEncode[[button]]" class="btn btn-info" role="HtmlEncode[[button]]" data-bs-dismiss="HtmlEncode[[modal]]"></button>`
Original file line number	Diff line number	Diff line change
`@@ -87,9 +87,9 @@ public class ButtonTagHelper : TagHelper`
`87`	`87`	`public bool Disabled { get; set; }`
`88`	`88`
`89`	`89`	`/// <summary>`
`90`		`- /// Is this a block level button`
	`90`	`+ /// If a value is provided this`
`91`	`91`	`/// </summary>`
`92`		`- public bool Block { get; set; }`
	`92`	`+ public string? Dismisses { get; set; }`
`93`	`93`
`94`	`94`	`/// <summary>`
`95`	`95`	`/// The size of this button`
`@@ -134,9 +134,9 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu`
`134`	`134`	`}, HtmlEncoder.Default);`
`135`	`135`	`}`
`136`	`136`
`137`		`- if (Block)`
	`137`	`+ if (!string.IsNullOrEmpty(Dismisses))`
`138`	`138`	`{`
`139`		`- output.AddClass("btn-block", HtmlEncoder.Default);`
	`139`	`+ output.Attributes.Add("data-bs-dismiss", Dismisses);`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`TagHelperContent? content = await output.GetChildContentAsync();`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ namespace ICG.AspNetCore.Utilities.Bootstrap5TagHelpers.Card`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// Tag Helper for the body of a Card`
`10`	`10`	`/// </summary>`
	`11`	`+ [HtmlTargetElement("card-body", ParentTag = "card")]`
`11`	`12`	`public class CardBodyTagHelper : TagHelper`
`12`	`13`	`{`
`13`	`14`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ namespace ICG.AspNetCore.Utilities.Bootstrap5TagHelpers.Card;`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// Tag Helper for rendering the header for a card`
`10`	`10`	`/// </summary>`
	`11`	`+[HtmlTargetElement("card-footer", ParentTag = "card")]`
`11`	`12`	`public class CardFooterTagHelper : TagHelper`
`12`	`13`	`{`
`13`	`14`	`/// <summary>`