Merge pull request #18307 from abpframework/salihozkara/fixFloatingLabel

Fix floating label

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

@@ -271,7 +271,7 @@ public class AbpInputTagHelperService : AbpTagHelperService<AbpInputTagHelper>
 
         if (string.IsNullOrEmpty(TagHelper.Label))
         {
-            return await GetLabelAsHtmlUsingTagHelperAsync(context, output, isCheckbox) + GetRequiredSymbol(context, output);
+            return await GetLabelAsHtmlUsingTagHelperAsync(context, output, isCheckbox);
         }
 
         var label = new TagBuilder("label");
@@ -392,6 +392,8 @@ public class AbpInputTagHelperService : AbpTagHelperService<AbpInputTagHelper>
             }
             innerOutput.Content.AppendHtml($" <i class=\"{iconClass}\"></i>");
         }
+        
+        innerOutput.Content.AppendHtml(GetRequiredSymbol(context, output));
 
         return innerOutput.Render(_encoder);
     }

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

@@ -185,11 +185,12 @@ public class AbpSelectTagHelperService : AbpTagHelperService<AbpSelectTagHelper>
             label.AddCssClass("form-label");
             label.Attributes.Add("for", GetIdAttributeValue(selectTag));
             label.InnerHtml.AppendHtml(_encoder.Encode(TagHelper.Label));
+            label.InnerHtml.AppendHtml(GetRequiredSymbol(context, output));
 
-            return label.ToHtmlString() + GetRequiredSymbol(context, output);
+            return label.ToHtmlString();
         }
 
-        return await GetLabelAsHtmlUsingTagHelperAsync(context, output) + GetRequiredSymbol(context, output);
+        return await GetLabelAsHtmlUsingTagHelperAsync(context, output);
     }
 
     protected virtual string GetRequiredSymbol(TagHelperContext context, TagHelperOutput output)
@@ -304,7 +305,11 @@ public class AbpSelectTagHelperService : AbpTagHelperService<AbpSelectTagHelper>
             ViewContext = TagHelper.ViewContext,
         };
 
-        return await labelTagHelper.RenderAsync(new TagHelperAttributeList { { "class", "form-label" } }, context, _encoder, "label", TagMode.StartTagAndEndTag);
+        var innerOutput = await labelTagHelper.ProcessAndGetOutputAsync(new TagHelperAttributeList { { "class", "form-label" } }, context, "label", TagMode.StartTagAndEndTag);
+        
+        innerOutput.Content.AppendHtml(GetRequiredSymbol(context, output));
+
+        return innerOutput.Render(_encoder);
     }
 
     protected virtual async Task<string> GetValidationAsHtmlAsync(TagHelperContext context, TagHelperOutput output, TagHelperOutput inputTag)