fixes #508 [HxCheckboxList] Default chip generation is unreasonable

havit · Mar 28, 2023 · 036042d · 036042d
1 parent 0f1a965
commit 036042d
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 1 deletion.
diff --git a/BlazorAppTest/Pages/InputsTest.razor b/BlazorAppTest/Pages/InputsTest.razor
@@ -81,6 +81,15 @@
 					</TextTemplate>
 				</HxCheckbox>
 
+				<HxCheckboxList TItem="CultureInfo"
+								TValue="string"
+								Label="HxCheckboxList"
+								ItemTextSelector="@(item => item.EnglishName)"
+								ItemValueSelector="@(item => item.EnglishName)"
+								Data="@cultureInfos"
+								@bind-Value="@model.CultureInfoMultiSelectNames" />
+
+
 				<HxSwitch Text="Switch" @bind-Value="@context.BoolSwitch" ValidationMessageMode="@validationMessageMode" />
 
 				<HxSubmit Icon="@BootstrapIcon.Check" Color="ThemeColor.Primary">Submit</HxSubmit>

diff --git a/...r.Components.Web.Bootstrap.Documentation/XmlDoc/Havit.Blazor.Components.Web.Bootstrap.xml b/...r.Components.Web.Bootstrap.Documentation/XmlDoc/Havit.Blazor.Components.Web.Bootstrap.xml
diff --git a/Havit.Blazor.Components.Web.Bootstrap.Documentation/XmlDoc/Havit.Blazor.Components.Web.xml b/Havit.Blazor.Components.Web.Bootstrap.Documentation/XmlDoc/Havit.Blazor.Components.Web.xml
diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/HxCheckboxList.cs b/Havit.Blazor.Components.Web.Bootstrap/Forms/HxCheckboxList.cs
@@ -137,6 +137,7 @@ protected override void BuildRenderInput(RenderTreeBuilder builder)
 
 				builder.AddAttribute(51, nameof(HxCheckbox.ValidationMessageMode), Havit.Blazor.Components.Web.Bootstrap.ValidationMessageMode.None);
 				builder.AddAttribute(52, nameof(HxCheckbox.Inline), this.Inline);
+				builder.AddAttribute(53, nameof(HxCheckbox.GenerateChip), false);
 
 				builder.AddMultipleAttributes(100, this.AdditionalAttributes);
 
@@ -179,4 +180,30 @@ public override ValueTask FocusAsync()
 		throw new NotSupportedException($"{nameof(FocusAsync)} is not supported on {nameof(HxCheckboxList<TValue, TItem>)}.");
 	}
 
+	/// <inheritdoc />
+	protected override string FormatValueAsString(List<TValue> value)
+	{
+		// Used for CurrentValueAsString (which is used for the chip generator).
+		if ((!value?.Any() ?? true) || (Data == null))
+		{
+			// don't care about chip generator, it does not call this method for null/empty value
+			return String.Empty;
+		}
+
+		// Take itemsToRender because they are sorted.
+		List<TItem> selectedItems = itemsToRender.Where(item => value.Contains(SelectorHelpers.GetValue<TItem, TValue>(ItemValueSelector, item))).ToList();
+		return String.Join(", ", selectedItems.Select(ItemTextSelector));
+	}
+
+	/// <inheritdoc />
+	protected override bool ShouldRenderChipGenerator()
+	{
+		return CurrentValue?.Any() ?? false;
+	}
+
+	/// <inheritdoc />
+	protected override List<TValue> GetChipRemoveValue()
+	{
+		return new List<TValue>();
+	}
 }