[HxSearchBox] Icon consolidation

havit · Mar 17, 2023 · 9c52ea1 · 9c52ea1
1 parent 4576f1b
commit 9c52ea1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/SearchBox/HxSearchBox.razor b/Havit.Blazor.Components.Web.Bootstrap/Forms/SearchBox/HxSearchBox.razor
@@ -42,7 +42,7 @@
                     placeholder="@Placeholder"
                     class="@CssClassHelper.Combine(
                        "form-control",
-                       (HasInputGroupEnd && HasInputGroups ? "hx-search-box-input-with-search-icon" : null),
+                       (!HasInputGroupEnd && HasInputGroups ? "hx-search-box-input-with-search-icon" : null),
                        InputCssClassEffective)" />
 
                 @if (!string.IsNullOrEmpty(Label) && LabelType == Havit.Blazor.Components.Web.Bootstrap.LabelType.Floating)

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/SearchBox/HxSearchBox.razor.cs b/Havit.Blazor.Components.Web.Bootstrap/Forms/SearchBox/HxSearchBox.razor.cs
@@ -1,4 +1,5 @@
 using Havit.Blazor.Components.Web.Bootstrap.Internal;
+using Microsoft.Extensions.Localization;
 using Microsoft.JSInterop;
 
 namespace Havit.Blazor.Components.Web.Bootstrap;
@@ -209,7 +210,8 @@ public partial class HxSearchBox<TItem> : IAsyncDisposable
 
 	[Inject] protected IJSRuntime JSRuntime { get; set; }
 
-	protected bool HasInputGroups => !String.IsNullOrWhiteSpace(InputGroupStartText) || !String.IsNullOrWhiteSpace(InputGroupEndText) || (InputGroupStartTemplate is not null) || (InputGroupEndTemplate is not null);
+	protected bool HasInputGroups => HasInputGroupStart || HasInputGroupEnd;
+	private bool HasInputGroupStart => !String.IsNullOrWhiteSpace(InputGroupStartText) || (InputGroupStartTemplate is not null);
 	private bool HasInputGroupEnd => !String.IsNullOrWhiteSpace(InputGroupEndText) || (InputGroupEndTemplate is not null);
 
 	private string dropdownToggleElementId = "hx" + Guid.NewGuid().ToString("N");

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/SearchBox/HxSearchBox.razor.css b/Havit.Blazor.Components.Web.Bootstrap/Forms/SearchBox/HxSearchBox.razor.css
@@ -17,6 +17,11 @@
     right: .75rem;
 }
 
+::deep .hx-search-box-input-with-search-icon {
+    border-top-right-radius: 0.375rem !important;
+    border-bottom-right-radius: 0.375rem !important;
+}
+
 .dropdown-item:not(:active) ::deep .hx-search-box-item-title {
     color: var(--hx-search-box-item-title-color);
 }