Add LabelType into application-wide Defaults (#873)

* Added custom validation options to Inputs, added LabelType in Default * revert HxInputBase custom validation parameters feature * HxSetup.Defaults - LabelType, InputSize --------- Co-authored-by: Robert Haken <[email protected]>
havit · Sep 30, 2024 · fd0b333 · fd0b333
1 parent e148bd0
commit fd0b333
Show file tree

Hide file tree

Showing 43 changed files with 214 additions and 119 deletions.
diff --git a/BlazorAppTest/Startup.cs b/BlazorAppTest/Startup.cs
@@ -46,7 +46,7 @@ public void ConfigureServices(IServiceCollection services)
 		//HxInputDateRange.Defaults.InputSize = InputSize.Large;
 		//HxCalendar.Defaults.DateCustomizationProvider = request => new CalendarDateCustomizationResult { Enabled = request.Date < DateTime.Today };
 		//HxMessageBox.Defaults.ModalSettings.Centered = true;
-		HxPlaceholder.Defaults.Color = ThemeColor.Light;
+		//HxPlaceholder.Defaults.Color = ThemeColor.Light;
 	}
 
 	// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

diff --git a/Havit.Blazor.Components.Web.Bootstrap.Smart/HxSmartComboBox.cs b/Havit.Blazor.Components.Web.Bootstrap.Smart/HxSmartComboBox.cs
@@ -26,10 +26,7 @@ public class HxSmartComboBox : HxInputBaseWithInputGroups<string>, IInputWithPla
 
 	static HxSmartComboBox()
 	{
-		Defaults = new InputTextSettings()
-		{
-			InputSize = Bootstrap.InputSize.Regular,
-		};
+		Defaults = new InputTextSettings();
 	}
 
 	/// <summary>
@@ -89,11 +86,12 @@ static HxSmartComboBox()
 	/// Size of the input.
 	/// </summary>
 	[Parameter] public InputSize? InputSize { get; set; }
-	protected InputSize InputSizeEffective => InputSize ?? GetSettings()?.InputSize ?? GetDefaults()?.InputSize ?? throw new InvalidOperationException(nameof(InputSize) + " default for " + nameof(HxInputNumber) + " has to be set.");
-	InputSize IInputWithSize.InputSizeEffective => InputSizeEffective;
+	protected InputSize InputSizeEffective => InputSize ?? GetSettings()?.InputSize ?? GetDefaults()?.InputSize ?? HxSetup.Defaults.InputSize; InputSize IInputWithSize.InputSizeEffective => InputSizeEffective;
 
 	/// <inheritdoc cref="Bootstrap.LabelType" />
 	[Parameter] public LabelType? LabelType { get; set; }
+	protected LabelType LabelTypeEffective => LabelType ?? GetSettings()?.LabelType ?? GetDefaults()?.LabelType ?? HxSetup.Defaults.LabelType;
+	LabelType IInputWithLabelType.LabelTypeEffective => LabelTypeEffective;
 
 	protected override void BuildRenderInput(RenderTreeBuilder builder)
 	{

diff --git a/Havit.Blazor.Components.Web.Bootstrap.Smart/HxSmartTextArea.cs b/Havit.Blazor.Components.Web.Bootstrap.Smart/HxSmartTextArea.cs
@@ -22,10 +22,7 @@ public class HxSmartTextArea : HxInputBase<string>, IInputWithPlaceholder, IInpu
 
 	static HxSmartTextArea()
 	{
-		Defaults = new InputTextSettings()
-		{
-			InputSize = Bootstrap.InputSize.Regular,
-		};
+		Defaults = new InputTextSettings();
 	}
 
 	/// <summary>
@@ -95,11 +92,12 @@ static HxSmartTextArea()
 	/// Size of the input.
 	/// </summary>
 	[Parameter] public InputSize? InputSize { get; set; }
-	protected InputSize InputSizeEffective => InputSize ?? GetSettings()?.InputSize ?? GetDefaults()?.InputSize ?? throw new InvalidOperationException(nameof(InputSize) + " default for " + nameof(HxInputNumber) + " has to be set.");
-	InputSize IInputWithSize.InputSizeEffective => InputSizeEffective;
+	protected InputSize InputSizeEffective => InputSize ?? GetSettings()?.InputSize ?? GetDefaults()?.InputSize ?? HxSetup.Defaults.InputSize; InputSize IInputWithSize.InputSizeEffective => InputSizeEffective;
 
 	/// <inheritdoc cref="Bootstrap.LabelType" />
 	[Parameter] public LabelType? LabelType { get; set; }
+	protected LabelType LabelTypeEffective => LabelType ?? GetSettings()?.LabelType ?? GetDefaults()?.LabelType ?? HxSetup.Defaults.LabelType;
+	LabelType IInputWithLabelType.LabelTypeEffective => LabelTypeEffective;
 
 	protected override void BuildRenderInput(RenderTreeBuilder builder)
 	{

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Files/HxInputFile.cs b/Havit.Blazor.Components.Web.Bootstrap/Files/HxInputFile.cs
@@ -17,10 +17,7 @@ public partial class HxInputFile : ComponentBase, ICascadeEnabledComponent, IFor
 
 	static HxInputFile()
 	{
-		Defaults = new InputFileSettings()
-		{
-			InputSize = Bootstrap.InputSize.Regular,
-		};
+		Defaults = new InputFileSettings();
 	}
 
 	/// <summary>
@@ -148,7 +145,7 @@ static HxInputFile()
 	/// Size of the input.
 	/// </summary>
 	[Parameter] public InputSize? InputSize { get; set; }
-	protected InputSize InputSizeEffective => InputSize ?? GetSettings()?.InputSize ?? GetDefaults()?.InputSize ?? throw new InvalidOperationException(nameof(InputSize) + " default for " + nameof(HxInputFile) + " has to be set.");
+	protected InputSize InputSizeEffective => InputSize ?? GetSettings()?.InputSize ?? GetDefaults()?.InputSize ?? HxSetup.Defaults.InputSize;
 	InputSize IInputWithSize.InputSizeEffective => InputSizeEffective;
 
 	/// <summary>

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Files/InputFileSettings.cs b/Havit.Blazor.Components.Web.Bootstrap/Files/InputFileSettings.cs
@@ -1,11 +1,9 @@
-using Havit.Blazor.Components.Web.Bootstrap.Internal;
-
-namespace Havit.Blazor.Components.Web.Bootstrap;
+namespace Havit.Blazor.Components.Web.Bootstrap;
 
 /// <summary>
 /// Settings for the <see cref="HxInputFile"/> component.
 /// </summary>
-public record InputFileSettings : IInputSettingsWithSize
+public record InputFileSettings
 {
 	/// <summary>
 	/// The size of the input.

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/Autosuggests/AutosuggestSettings.cs b/Havit.Blazor.Components.Web.Bootstrap/Forms/Autosuggests/AutosuggestSettings.cs
@@ -1,11 +1,9 @@
-using Havit.Blazor.Components.Web.Bootstrap.Internal;
-
-namespace Havit.Blazor.Components.Web.Bootstrap;
+namespace Havit.Blazor.Components.Web.Bootstrap;
 
 /// <summary>
 /// Settings for the <see cref="HxAutosuggest{TItem, TValue} "/> and derived components.
 /// </summary>
-public record AutosuggestSettings : InputSettings, IInputSettingsWithSize
+public record AutosuggestSettings : InputSettings
 {
 	/// <summary>
 	/// Icon displayed in the input when no item is selected.
@@ -31,4 +29,9 @@ public record AutosuggestSettings : InputSettings, IInputSettingsWithSize
 	/// The input size.
 	/// </summary>
 	public InputSize? InputSize { get; set; }
+
+	/// <summary>
+	/// The label type.
+	/// </summary>
+	public LabelType? LabelType { get; set; }
 }
diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/Autosuggests/HxAutosuggest.cs b/Havit.Blazor.Components.Web.Bootstrap/Forms/Autosuggests/HxAutosuggest.cs
@@ -93,11 +93,13 @@ public class HxAutosuggest<TItem, TValue> : HxInputBase<TValue>, IInputWithSize,
 	/// The size of the input.
 	/// </summary>
 	[Parameter] public InputSize? InputSize { get; set; }
-	protected InputSize InputSizeEffective => InputSize ?? GetSettings()?.InputSize ?? GetDefaults()?.InputSize ?? throw new InvalidOperationException(nameof(InputSize) + " default for " + nameof(HxAutosuggest) + " has to be set.");
+	protected InputSize InputSizeEffective => InputSize ?? GetSettings()?.InputSize ?? GetDefaults()?.InputSize ?? HxSetup.Defaults.InputSize;
 	InputSize IInputWithSize.InputSizeEffective => InputSizeEffective;
 
 	/// <inheritdoc cref="Bootstrap.LabelType" />
 	[Parameter] public LabelType? LabelType { get; set; }
+	protected LabelType LabelTypeEffective => LabelType ?? GetSettings()?.LabelType ?? GetDefaults()?.LabelType ?? HxSetup.Defaults.LabelType;
+	LabelType IInputWithLabelType.LabelTypeEffective => LabelTypeEffective;
 
 	/// <summary>
 	/// The offset between the dropdown and the input.

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/Autosuggests/HxAutosuggest.nongeneric.cs b/Havit.Blazor.Components.Web.Bootstrap/Forms/Autosuggests/HxAutosuggest.nongeneric.cs
@@ -14,7 +14,6 @@ static HxAutosuggest()
 	{
 		Defaults = new AutosuggestSettings()
 		{
-			InputSize = InputSize.Regular,
 			SearchIcon = BootstrapIcon.Search,
 			ClearIcon = BootstrapIcon.XLg,
 			MinimumLength = 2,

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/FormValueSettings.cs b/Havit.Blazor.Components.Web.Bootstrap/Forms/FormValueSettings.cs
@@ -1,11 +1,9 @@
-using Havit.Blazor.Components.Web.Bootstrap.Internal;
-
-namespace Havit.Blazor.Components.Web.Bootstrap;
+namespace Havit.Blazor.Components.Web.Bootstrap;
 
 /// <summary>
 /// Settings for the <see cref="HxFormValue"/> and derived components.
 /// </summary>
-public record FormValueSettings : IInputSettingsWithSize
+public record FormValueSettings
 {
 	/// <summary>
 	/// Input size. The default is <see cref="InputSize.Regular"/>.

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/HxFormValue.cs b/Havit.Blazor.Components.Web.Bootstrap/Forms/HxFormValue.cs
@@ -15,10 +15,7 @@ public class HxFormValue : ComponentBase, IFormValueComponent, IFormValueCompone
 
 	static HxFormValue()
 	{
-		Defaults = new FormValueSettings()
-		{
-			InputSize = Bootstrap.InputSize.Regular,
-		};
+		Defaults = new FormValueSettings();
 	}
 
 	/// <summary>
@@ -90,7 +87,7 @@ static HxFormValue()
 	/// Size of the input.
 	/// </summary>
 	[Parameter] public InputSize? InputSize { get; set; }
-	protected InputSize InputSizeEffective => InputSize ?? GetSettings()?.InputSize ?? GetDefaults()?.InputSize ?? throw new InvalidOperationException(nameof(InputSize) + " default for " + nameof(HxFormValue) + " has to be set.");
+	protected InputSize InputSizeEffective => InputSize ?? GetSettings()?.InputSize ?? GetDefaults()?.InputSize ?? HxSetup.Defaults.InputSize;
 	InputSize IInputWithSize.InputSizeEffective => InputSizeEffective;
 
 

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/HxInputBase.cs b/Havit.Blazor.Components.Web.Bootstrap/Forms/HxInputBase.cs
@@ -205,7 +205,7 @@ protected override void OnParametersSet()
 
 		if ((this is IInputWithLabelType inputWithLabelType)
 			&& (this is IInputWithPlaceholder inputWithPlaceholder)
-			&& (inputWithLabelType.LabelType == LabelType.Floating)
+			&& (inputWithLabelType.LabelTypeEffective == LabelType.Floating)
 			&& !String.IsNullOrEmpty(inputWithPlaceholder.Placeholder))
 		{
 			throw new InvalidOperationException($"Cannot use {nameof(IInputWithPlaceholder.Placeholder)} with floating labels.");

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/HxInputBase.nongeneric.cs b/Havit.Blazor.Components.Web.Bootstrap/Forms/HxInputBase.nongeneric.cs
@@ -14,7 +14,7 @@ static HxInputBase()
 	{
 		Defaults = new InputSettings()
 		{
-			ValidationMessageMode = ValidationMessageMode.Floating
+			ValidationMessageMode = ValidationMessageMode.Floating,
 		};
 	}
 }
diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/HxInputDate.cs b/Havit.Blazor.Components.Web.Bootstrap/Forms/HxInputDate.cs
@@ -62,7 +62,7 @@ public class HxInputDate<TValue> : HxInputBase<TValue>, IInputWithPlaceholder, I
 	/// Size of the input.
 	/// </summary>
 	[Parameter] public InputSize? InputSize { get; set; }
-	protected InputSize InputSizeEffective => InputSize ?? GetSettings()?.InputSize ?? GetDefaults()?.InputSize ?? throw new InvalidOperationException(nameof(InputSize) + " default for " + nameof(HxInputDate) + " has to be set.");
+	protected InputSize InputSizeEffective => InputSize ?? GetSettings()?.InputSize ?? GetDefaults()?.InputSize ?? HxSetup.Defaults.InputSize;
 	InputSize IInputWithSize.InputSizeEffective => InputSizeEffective;
 
 	/// <summary>
@@ -101,6 +101,9 @@ public class HxInputDate<TValue> : HxInputBase<TValue>, IInputWithPlaceholder, I
 
 	/// <inheritdoc cref="Bootstrap.LabelType" />
 	[Parameter] public LabelType? LabelType { get; set; }
+	protected LabelType LabelTypeEffective => LabelType ?? GetSettings()?.LabelType ?? GetDefaults()?.LabelType ?? HxSetup.Defaults.LabelType;
+	LabelType IInputWithLabelType.LabelTypeEffective => LabelTypeEffective;
+
 	protected override LabelValueRenderOrder RenderOrder => (LabelType == Bootstrap.LabelType.Floating) ? LabelValueRenderOrder.ValueOnly /* label rendered by HxInputDateInternal */ : LabelValueRenderOrder.LabelValue;
 
 	/// <summary>

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/HxInputDate.nongeneric.cs b/Havit.Blazor.Components.Web.Bootstrap/Forms/HxInputDate.nongeneric.cs
@@ -15,7 +15,6 @@ static HxInputDate()
 	{
 		Defaults = new InputDateSettings()
 		{
-			InputSize = InputSize.Regular,
 			MinDate = HxCalendar.DefaultMinDate,
 			MaxDate = HxCalendar.DefaultMaxDate,
 			ShowClearButton = true,

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/HxInputDateRange.cs b/Havit.Blazor.Components.Web.Bootstrap/Forms/HxInputDateRange.cs
@@ -19,7 +19,6 @@ static HxInputDateRange()
 	{
 		Defaults = new InputDateRangeSettings()
 		{
-			InputSize = Bootstrap.InputSize.Regular,
 			MinDate = HxCalendar.DefaultMinDate,
 			MaxDate = HxCalendar.DefaultMaxDate,
 			ShowClearButton = true,
@@ -63,7 +62,7 @@ static HxInputDateRange()
 	/// Size of the input.
 	/// </summary>
 	[Parameter] public InputSize? InputSize { get; set; }
-	protected InputSize InputSizeEffective => InputSize ?? GetSettings()?.InputSize ?? GetDefaults()?.InputSize ?? throw new InvalidOperationException(nameof(InputSize) + " default for " + nameof(HxInputDateRange) + " has to be set.");
+	protected InputSize InputSizeEffective => InputSize ?? GetSettings()?.InputSize ?? GetDefaults()?.InputSize ?? HxSetup.Defaults.InputSize;
 	InputSize IInputWithSize.InputSizeEffective => InputSizeEffective;
 
 	/// <summary>

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/HxInputNumber.cs b/Havit.Blazor.Components.Web.Bootstrap/Forms/HxInputNumber.cs
@@ -79,7 +79,7 @@ public class HxInputNumber<TValue> : HxInputBaseWithInputGroups<TValue>, IInputW
 	/// Size of the input.
 	/// </summary>
 	[Parameter] public InputSize? InputSize { get; set; }
-	protected InputSize InputSizeEffective => InputSize ?? GetSettings()?.InputSize ?? GetDefaults()?.InputSize ?? throw new InvalidOperationException(nameof(InputSize) + " default for " + nameof(HxInputNumber) + " has to be set.");
+	protected InputSize InputSizeEffective => InputSize ?? GetSettings()?.InputSize ?? GetDefaults()?.InputSize ?? HxSetup.Defaults.InputSize;
 	InputSize IInputWithSize.InputSizeEffective => InputSizeEffective;
 
 	/// <summary>
@@ -90,6 +90,8 @@ public class HxInputNumber<TValue> : HxInputBaseWithInputGroups<TValue>, IInputW
 
 	/// <inheritdoc cref="Bootstrap.LabelType" />
 	[Parameter] public LabelType? LabelType { get; set; }
+	protected LabelType LabelTypeEffective => LabelType ?? GetSettings()?.LabelType ?? GetDefaults()?.LabelType ?? HxSetup.Defaults.LabelType;
+	LabelType IInputWithLabelType.LabelTypeEffective => LabelTypeEffective;
 
 #pragma warning disable BL0007 // Component parameter 'Havit.Blazor.Components.Web.Bootstrap.HxInputNumber<TValue>.Decimals' should be auto property
 	/// <summary>

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/HxInputNumber.nongeneric.cs b/Havit.Blazor.Components.Web.Bootstrap/Forms/HxInputNumber.nongeneric.cs
@@ -15,7 +15,6 @@ static HxInputNumber()
 	{
 		Defaults = new InputNumberSettings()
 		{
-			InputSize = InputSize.Regular,
 			SelectOnFocus = true
 		};
 	}

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/HxInputText.cs b/Havit.Blazor.Components.Web.Bootstrap/Forms/HxInputText.cs
@@ -15,7 +15,6 @@ static HxInputText()
 	{
 		Defaults = new InputTextSettings()
 		{
-			InputSize = Bootstrap.InputSize.Regular,
 			SelectOnFocus = false
 		};
 	}

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/HxInputTextBase.cs b/Havit.Blazor.Components.Web.Bootstrap/Forms/HxInputTextBase.cs
@@ -56,7 +56,7 @@ public abstract class HxInputTextBase : HxInputBaseWithInputGroups<string>, IInp
 	/// Size of the input.
 	/// </summary>
 	[Parameter] public InputSize? InputSize { get; set; }
-	protected InputSize InputSizeEffective => InputSize ?? GetSettings()?.InputSize ?? GetDefaults()?.InputSize ?? throw new InvalidOperationException(nameof(InputSize) + " default for " + GetType().Name + " has to be set.");
+	protected InputSize InputSizeEffective => InputSize ?? GetSettings()?.InputSize ?? GetDefaults()?.InputSize ?? HxSetup.Defaults.InputSize;
 	InputSize IInputWithSize.InputSizeEffective => InputSizeEffective;
 
 	/// <summary>
@@ -67,6 +67,8 @@ public abstract class HxInputTextBase : HxInputBaseWithInputGroups<string>, IInp
 
 	/// <inheritdoc cref="Bootstrap.LabelType" />
 	[Parameter] public LabelType? LabelType { get; set; }
+	protected LabelType LabelTypeEffective => LabelType ?? GetSettings()?.LabelType ?? GetDefaults()?.LabelType ?? HxSetup.Defaults.LabelType;
+	LabelType IInputWithLabelType.LabelTypeEffective => LabelTypeEffective;
 
 	/// <inheritdoc />
 	protected override void BuildRenderInput(RenderTreeBuilder builder)

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/HxMultiSelect.cs b/Havit.Blazor.Components.Web.Bootstrap/Forms/HxMultiSelect.cs
@@ -34,7 +34,7 @@ public class HxMultiSelect<TValue, TItem> : HxInputBase<List<TValue>>, IInputWit
 	/// Size of the input.
 	/// </summary>
 	[Parameter] public InputSize? InputSize { get; set; }
-	protected InputSize InputSizeEffective => InputSize ?? GetSettings()?.InputSize ?? GetDefaults()?.InputSize ?? throw new InvalidOperationException(nameof(InputSize) + " default for " + nameof(HxMultiSelect) + " has to be set.");
+	protected InputSize InputSizeEffective => InputSize ?? GetSettings()?.InputSize ?? GetDefaults()?.InputSize ?? HxSetup.Defaults.InputSize;
 	InputSize IInputWithSize.InputSizeEffective => InputSizeEffective;
 	string IInputWithSize.GetInputSizeCssClass() => InputSizeEffective.AsFormSelectCssClass();
 

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/HxMultiSelect.nongeneric.cs b/Havit.Blazor.Components.Web.Bootstrap/Forms/HxMultiSelect.nongeneric.cs
@@ -14,7 +14,6 @@ static HxMultiSelect()
 	{
 		Defaults = new MultiSelectSettings()
 		{
-			InputSize = InputSize.Regular,
 			AllowFiltering = false,
 			AllowSelectAll = false,
 			ClearFilterOnHide = true

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/HxSelect.nongeneric.cs b/Havit.Blazor.Components.Web.Bootstrap/Forms/HxSelect.nongeneric.cs
@@ -12,9 +12,6 @@ public class HxSelect
 
 	static HxSelect()
 	{
-		Defaults = new SelectSettings()
-		{
-			InputSize = InputSize.Regular,
-		};
+		Defaults = new SelectSettings();
 	}
 }
diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/HxSelectBase.cs b/Havit.Blazor.Components.Web.Bootstrap/Forms/HxSelectBase.cs
@@ -22,7 +22,10 @@ public abstract class HxSelectBase<TValue, TItem> : HxInputBaseWithInputGroups<T
 	/// </summary>
 	[Parameter] public SelectSettings Settings { get; set; }
 
+	/// <inheritdoc cref="Bootstrap.LabelType" />
 	[Parameter] public LabelType? LabelType { get; set; }
+	protected LabelType LabelTypeEffective => LabelType ?? GetSettings()?.LabelType ?? GetDefaults()?.LabelType ?? HxSetup.Defaults.LabelType;
+	LabelType IInputWithLabelType.LabelTypeEffective => LabelTypeEffective;
 
 	/// <summary>
 	/// Returns an optional set of component settings.
@@ -37,7 +40,7 @@ public abstract class HxSelectBase<TValue, TItem> : HxInputBaseWithInputGroups<T
 	/// Size of the input.
 	/// </summary>
 	[Parameter] public InputSize? InputSize { get; set; }
-	protected InputSize InputSizeEffective => InputSize ?? GetSettings()?.InputSize ?? GetDefaults()?.InputSize ?? throw new InvalidOperationException(nameof(InputSize) + " default for " + nameof(HxSelect) + " has to be set.");
+	protected InputSize InputSizeEffective => InputSize ?? GetSettings()?.InputSize ?? GetDefaults()?.InputSize ?? HxSetup.Defaults.InputSize;
 	InputSize IInputWithSize.InputSizeEffective => InputSizeEffective;
 
 	/// <summary>

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/InputDateRangeSettings.cs b/Havit.Blazor.Components.Web.Bootstrap/Forms/InputDateRangeSettings.cs
@@ -5,7 +5,7 @@ namespace Havit.Blazor.Components.Web.Bootstrap;
 /// <summary>
 /// Settings for <see cref="HxInputDateRange"/>.
 /// </summary>
-public record InputDateRangeSettings : InputSettings, IInputSettingsWithSize
+public record InputDateRangeSettings : InputSettings
 {
 	/// <summary>
 	/// Input size.

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/InputDateSettings.cs b/Havit.Blazor.Components.Web.Bootstrap/Forms/InputDateSettings.cs
@@ -5,13 +5,18 @@ namespace Havit.Blazor.Components.Web.Bootstrap;
 /// <summary>
 /// Settings for <see cref="HxInputDate{TValue}"/>.
 /// </summary>
-public record InputDateSettings : InputSettings, IInputSettingsWithSize
+public record InputDateSettings : InputSettings
 {
 	/// <summary>
 	/// Input size.
 	/// </summary>
 	public InputSize? InputSize { get; set; }
 
+	/// <summary>
+	/// The label type.
+	/// </summary>
+	public LabelType? LabelType { get; set; }
+
 	/// <summary>
 	/// Optional icon to display within the input.
 	/// </summary>

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/InputNumberSettings.cs b/Havit.Blazor.Components.Web.Bootstrap/Forms/InputNumberSettings.cs
@@ -1,17 +1,20 @@
-using Havit.Blazor.Components.Web.Bootstrap.Internal;
-
-namespace Havit.Blazor.Components.Web.Bootstrap;
+namespace Havit.Blazor.Components.Web.Bootstrap;
 
 /// <summary>
 /// Settings for the <see cref="HxInputNumber{TValue}"/> and derived components.
 /// </summary>
-public record InputNumberSettings : InputSettings, IInputSettingsWithSize
+public record InputNumberSettings : InputSettings
 {
 	/// <summary>
 	/// The size of the input.
 	/// </summary>
 	public InputSize? InputSize { get; set; }
 
+	/// <summary>
+	/// The label type.
+	/// </summary>
+	public LabelType? LabelType { get; set; }
+
 	/// <summary>
 	/// A hint to browsers regarding the type of virtual keyboard configuration to use when editing.
 	/// </summary>
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,6 @@ static HxInputNumber() @@
     	{
     		Defaults = new InputNumberSettings()
     		{
-    			InputSize = InputSize.Regular,
     			SelectOnFocus = true
     		};
     	}
@@ Expand Down @@