Improved display for Floating Labels

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs

@@ -227,10 +227,11 @@ public class AbpInputTagHelperService : AbpTagHelperService<AbpInputTagHelper>
 
         var attribute = TagHelper.AspFor.ModelExplorer.GetAttribute<Placeholder>();
 
-        if (attribute != null)
+        if (attribute != null || TagHelper.FloatingLabel)
         {
-            var placeholderLocalized = _tagHelperLocalizer.GetLocalizedText(attribute.Value, TagHelper.AspFor.ModelExplorer);
+            var placeholderLocalized = _tagHelperLocalizer.GetLocalizedText(attribute?.Value ?? string.Empty, TagHelper.AspFor.ModelExplorer);
-
+            if (string.IsNullOrWhiteSpace(placeholderLocalized))
+                placeholderLocalized = TagHelper.AspFor.Name;
             inputTagHelperOutput.Attributes.Add("placeholder", placeholderLocalized);
         }
     }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs

@@ -1,15 +1,14 @@
-using Microsoft.AspNetCore.Mvc.Diagnostics;
+using System;
-using Microsoft.AspNetCore.Mvc.Rendering;
-using Microsoft.AspNetCore.Mvc.TagHelpers;
-using Microsoft.AspNetCore.Mvc.ViewFeatures;
-using Microsoft.AspNetCore.Razor.TagHelpers;
-using Microsoft.Extensions.Localization;
-using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.TagHelpers;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Microsoft.AspNetCore.Razor.TagHelpers;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Extensions;
 using Volo.Abp.Localization;
@@ -38,7 +37,7 @@ public class AbpSelectTagHelperService : AbpTagHelperService<AbpSelectTagHelper>
         _abpEnumLocalizer = abpEnumLocalizer;
     }
 
-    public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+    public async override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
     {
         var childContent = await output.GetChildContentAsync();
 
@@ -74,7 +73,8 @@ public class AbpSelectTagHelperService : AbpTagHelperService<AbpSelectTagHelper>
         var validation = await GetValidationAsHtmlAsync(context, output, selectTag);
         var infoText = GetInfoAsHtml(context, output, selectTag);
 
-        return label + Environment.NewLine + selectAsHtml + Environment.NewLine + infoText + Environment.NewLine + validation;
+        return TagHelper.FloatingLabel ? selectAsHtml + Environment.NewLine + label + Environment.NewLine + infoText + Environment.NewLine + validation :
+                                         label + Environment.NewLine + selectAsHtml + Environment.NewLine + infoText + Environment.NewLine + validation;
     }
 
     protected virtual string SurroundInnerHtmlAndGet(TagHelperContext context, TagHelperOutput output, string innerHtml)
@@ -156,23 +156,15 @@ public class AbpSelectTagHelperService : AbpTagHelperService<AbpSelectTagHelper>
         }
 
         var selectItemsAttribute = TagHelper.AspFor.ModelExplorer.GetAttribute<SelectItems>();
-        if (selectItemsAttribute != null)
+        return selectItemsAttribute != null
-        {
+            ? GetSelectItemsFromAttribute(selectItemsAttribute, TagHelper.AspFor.ModelExplorer)
-            return GetSelectItemsFromAttribute(selectItemsAttribute, TagHelper.AspFor.ModelExplorer);
+            : throw new Exception("No items provided for select attribute.");
-        }
-
-        throw new Exception("No items provided for select attribute.");
     }
 
     private bool IsEnum()
     {
         var value = TagHelper.AspFor.Model;
-        if (value != null && value.GetType().IsEnum)
+        return (value != null && value.GetType().IsEnum) || TagHelper.AspFor.ModelExplorer.Metadata.IsEnum;
-        {
-            return true;
-        }
-
-        return TagHelper.AspFor.ModelExplorer.Metadata.IsEnum;
     }
 
     protected virtual async Task<string> GetLabelAsHtmlAsync(TagHelperContext context, TagHelperOutput output, TagHelperOutput selectTag)
@@ -296,12 +288,7 @@ public class AbpSelectTagHelperService : AbpTagHelperService<AbpSelectTagHelper>
     {
         var selectItems = selectItemsAttribute.GetItems(explorer)?.ToList();
 
-        if (selectItems == null)
+        return selectItems ?? new List<SelectListItem>();
-        {
-            return new List<SelectListItem>();
-        }
-
-        return selectItems;
     }
 
     protected virtual async Task<string> GetLabelAsHtmlUsingTagHelperAsync(TagHelperContext context, TagHelperOutput output)
@@ -337,17 +324,13 @@ public class AbpSelectTagHelperService : AbpTagHelperService<AbpSelectTagHelper>
             TagHelper.Size = attribute.Size;
         }
 
-        switch (TagHelper.Size)
+        return TagHelper.Size switch
         {
-            case AbpFormControlSize.Small:
+            AbpFormControlSize.Small => "form-select-sm",
-                return "form-select-sm";
+            AbpFormControlSize.Medium => "form-select-md",
-            case AbpFormControlSize.Medium:
+            AbpFormControlSize.Large => "form-select-lg",
-                return "form-select-md";
+            _ => "",
-            case AbpFormControlSize.Large:
+        };
-                return "form-select-lg";
-        }
-
-        return "";
     }
 
     protected virtual TagHelperAttributeList GetInputAttributes(TagHelperContext context, TagHelperOutput output)
@@ -376,7 +359,7 @@ public class AbpSelectTagHelperService : AbpTagHelperService<AbpSelectTagHelper>
 
         foreach (var tagHelperAttribute in tagHelperAttributes)
         {
-            var nameWithoutPrefix = tagHelperAttribute.Name.Substring(groupPrefix.Length);
+            var nameWithoutPrefix = tagHelperAttribute.Name[groupPrefix.Length..];
             var newAttritube = new TagHelperAttribute(nameWithoutPrefix, tagHelperAttribute.Value);
             output.Attributes.Add(newAttritube);
         }