[WIP] Refactor components to match converter refactor

Components/Autocomplete/Autocomplete.razor

@@ -5,14 +5,14 @@
 <CascadingValue Name="SubscribeToParentForm" Value="false" IsFixed="true">
     <div class="@AutocompleteClassList">
         <InputControl Label="@Label" Variant="@Variant" HelperText="@HelperText" HelperTextOnFocus="@HelperTextOnFocus" FullWidth="@FullWidth" Margin="@Margin" Class="@ClassList()" Style="@Style"
-                         Error="@Error" ErrorText="@ErrorText" Disabled="@Disabled" @onclick="@ToggleMenu" Required="@Required" ForId="@FieldId">
+                         Error="@HasError" ErrorText="@ErrorText" Disabled="@Disabled" @onclick="@ToggleMenu" Required="@Required" ForId="@FieldId">
             <InputContent>
                 <Input @ref="_elementReference" @key="_elementKey" InputType="InputType.Text"
                           Class="select-input" Margin="@Margin"
                           Variant="@Variant"
                           TextUpdateSuppression="@TextUpdateSuppression"
                           Value="@Text" DisableUnderLine="@DisableUnderLine"
-                          Disabled="@Disabled" ReadOnly="@ReadOnly" Error="@Error"
+                          Disabled="@Disabled" ReadOnly="@ReadOnly" Error="@HasError"
                           OnAdornmentClick="@OnAdornmentClick" AdornmentIcon="@CurrentIcon" Adornment="@Adornment" AdornmentColor="@AdornmentColor" IconSize="@IconSize" AdornmentText="@AdornmentText"
                           Clearable="@Clearable" OnClearButtonClick="@OnClearButtonClick"
                           @attributes="UserAttributes"

Components/Autocomplete/Autocomplete.razor.cs

@@ -83,10 +83,7 @@ public partial class Autocomplete<T> : InputBase<T>, IDisposable
 
 				_toStringFunc = value;
 
-			Converter = new Converter<T>
+				Converter = new LambdaConverter<T, string>(_toStringFunc ?? (x => x?.ToString()), null);
-			{
-				SetFunc = _toStringFunc ?? (x => x?.ToString()),
-			};
 		  }
 	 }
 	 /// <summary>
@@ -461,7 +458,7 @@ public partial class Autocomplete<T> : InputBase<T>, IDisposable
 				return string.Empty;
 		  try
 		  {
-			return Converter.Set(item);
+				return Converter.Convert(item);
 		  }
 		  catch (NullReferenceException) { }
 
@@ -628,7 +625,7 @@ public partial class Autocomplete<T> : InputBase<T>, IDisposable
 
 		  _timer?.Dispose();
 
-		var value = Converter.Get(Text);
+		  var value = Converter.ConvertBack(Text);
 
 		  return SetValueAsync(value, updateText: false);
 	 }

Components/BooleanInput.cs

@@ -44,17 +44,17 @@ public class BooleanInput<T> : FormComponent<T, bool?>
 	/// </summary>
 	[Parameter] public EventCallback<T> CheckedChanged { get; set; }
 
-	protected bool? BoolValue => Converter.Set(Checked);
+	protected bool? BoolValue => Converter.Convert(Checked);
 
 	protected virtual Task OnChange(ChangeEventArgs args)
 	{
-		Touched = true;
+		Modified = true;
 		return SetBoolValueAsync((bool?)args.Value);
 	}
 
 	protected Task SetBoolValueAsync(bool? value)
 	{
-		return SetCheckedAsync(Converter.Get(value));
+		return SetCheckedAsync(Converter.ConvertBack(value));
 	}
 
 	protected async Task SetCheckedAsync(T value)
@@ -74,7 +74,7 @@ public class BooleanInput<T> : FormComponent<T, bool?>
 	{
 		var changed = base.SetConverter(value);
 		if (changed)
-			SetBoolValueAsync(Converter.Set(Checked)).AndForget();
+			SetBoolValueAsync(Converter.Convert(Checked)).AndForget();
 
 		return changed;
 	}

Components/CheckBox/CheckBox.razor.cs

@@ -139,7 +139,7 @@ public partial class CheckBox<T> : BooleanInput<T>
 
 	protected override Task OnChange(ChangeEventArgs args)
 	{
-		Touched = true;
+		Modified = true;
 
 		// Apply only when TriState parameter is set to true and T is bool?
 		if (TriState && typeof(T) == typeof(bool?))

Components/DataGrid/DataGrid.razor.cs

@@ -116,11 +116,7 @@ public partial class DataGrid<T> : UIComponent
 	 internal bool isEditFormOpen;
 
 	 // converters
-   private Converter<bool, bool?> _oppositeBoolConverter = new Converter<bool, bool?>
+	 private Converter<bool, bool?> _oppositeBoolConverter = new LambdaConverter<bool, bool?>(value => value ? false : true, value => value.HasValue ? !value.Value : true);
-   {
-      SetFunc = value => value ? false : true,
-      GetFunc = value => value.HasValue ? !value.Value : true,
-   };
 
 	 #region Notify Children Delegates
 

Components/DatePicker/DatePicker.cs

@@ -30,7 +30,7 @@ public class DatePicker : DatePickerBase
 	{
 		if (_value != date)
 		{
-			Touched = true;
+			Modified = true;
 
 			if (date is not null && IsDateDisabledFunc(date.Value.Date))
 			{
@@ -40,10 +40,8 @@ public class DatePicker : DatePickerBase
 
 			_value = date;
 			if (updateValue)
-			{
+				await SetTextAsync(Converter.Convert(_value), false);
-				Converter.GetError = false;
+			
-				await SetTextAsync(Converter.Set(_value), false);
-			}
 			await DateChanged.InvokeAsync(_value);
 			BeginValidate();
 			FieldChanged(_value);
@@ -52,15 +50,15 @@ public class DatePicker : DatePickerBase
 
 	protected override Task DateFormatChanged(string newFormat)
 	{
-		Touched = true;
+		Modified = true;
-		return SetTextAsync(Converter.Set(_value), false);
+		return SetTextAsync(Converter.Convert(_value), false);
 	}
 
 	protected override Task StringValueChanged(string value)
 	{
-		Touched = true;
+		Modified = true;
 		// Update the date property (without updating back the Value property)
-		return SetDateAsync(Converter.Get(value), false);
+		return SetDateAsync(Converter.ConvertBack(value), false);
 	}
 
 	protected override string GetDayClasses(int month, DateTime day)

Components/DatePicker/DatePickerBase.razor.cs

@@ -230,7 +230,7 @@ public abstract partial class DatePickerBase : Picker<DateTime?>
 		base.OnPickerOpened();
 		if (Editable == true && Text != null)
 		{
-			DateTime? a = Converter.Get(Text);
+			DateTime? a = Converter.ConvertBack(Text);
 			if (a.HasValue)
 			{
 				a = new DateTime(a.Value.Year, a.Value.Month, 1);

Components/DatePicker/DateRange.cs

@@ -1,4 +1,6 @@
-namespace Connected.Components;
+using Connected.Extensions;
+
+namespace Connected.Components;
 
 public class DateRange : Range<DateTime?>, IEquatable<DateRange>
 {
@@ -15,7 +17,7 @@ public class DateRange : Range<DateTime?>, IEquatable<DateRange>
       if (Start == null || End == null)
          return string.Empty;
 
-      return RangeConverter<DateTime>.Join(converter.Set(Start.Value), converter.Set(End.Value));
+      return RangeConverter<DateTime>.Join(converter.Convert(Start.Value), converter.Convert(End.Value));
    }
 
    public string ToIsoDateString()
@@ -40,12 +42,14 @@ public class DateRange : Range<DateTime?>, IEquatable<DateRange>
    {
       date = null;
 
-      var endDate = converter.Get(end);
+      var endDate = converter.ConvertBack(end);
-      if (converter.GetError)
+
+      if (endDate is null)
          return false;
 
-      var startDate = converter.Get(start);
+      var startDate = converter.ConvertBack(start);
-      if (converter.GetError)
+
+      if (startDate is null)
          return false;
 
       date = new DateRange(startDate, endDate);

Components/DatePicker/DateRangePicker.razor

@@ -6,13 +6,13 @@
 @code{
 
     protected override RenderFragment InputContent=> 
-        @<InputControl Label="@Label" Variant="@Variant" HelperText="@HelperText" Error="@Error" 
+        @<InputControl Label="@Label" Variant="@Variant" HelperText="@HelperText" Error="@HasError" 
                           ErrorText="@ErrorText" Disabled="@Disabled" Margin="@Margin" Required="@Required"
                           @onclick="() => { if (!Editable) ToggleState(); }" ForId="@FieldId">
                <InputContent>
                    <RangeInput @ref="_rangeInput" @attributes="UserAttributes" InputType="@InputType.Text" Class="@PickerInputClass" Style="@Style" Variant="@Variant" ReadOnly="@(!Editable)"
                                    @bind-Value="@RangeText" Disabled="@Disabled" Adornment="@Adornment" AdornmentIcon="@AdornmentIcon" AdornmentColor="@AdornmentColor" IconSize="@IconSize" OnAdornmentClick="ToggleState"
-                                   Required="@Required" RequiredError="@RequiredError" Error="@Error" ErrorText="@ErrorText" Margin="@Margin" AdornmentAriaLabel="@AdornmentAriaLabel"/>
+                                   Required="@Required" RequiredError="@RequiredError" Error="@HasError" ErrorText="@ErrorText" Margin="@Margin" AdornmentAriaLabel="@AdornmentAriaLabel"/>
                </InputContent>
            </InputControl>;
     

Components/DatePicker/DateRangePicker.razor.cs

@@ -57,7 +57,6 @@ public partial class DateRangePicker : DatePickerBase
 
          if (updateValue)
          {
-            Converter.GetError = false;
             if (_dateRange == null)
             {
                _rangeText = null;
@@ -66,8 +65,8 @@ public partial class DateRangePicker : DatePickerBase
             else
             {
                _rangeText = new Range<string>(
-                   Converter.Set(_dateRange.Start),
+                   Converter.Convert(_dateRange.Start),
-                   Converter.Set(_dateRange.End));
+                   Converter.Convert(_dateRange.End));
                await SetTextAsync(_dateRange.ToString(Converter), false);
             }
          }
@@ -85,7 +84,7 @@ public partial class DateRangePicker : DatePickerBase
          if (_rangeText?.Equals(value) ?? value == null)
             return;
 
-         Touched = true;
+         Modified = true;
          _rangeText = value;
          SetDateRangeAsync(ParseDateRangeValue(value?.Start, value?.End), false).AndForget();
       }
@@ -135,13 +134,13 @@ public partial class DateRangePicker : DatePickerBase
 
    protected override Task DateFormatChanged(string newFormat)
    {
-      Touched = true;
+      Modified = true;
       return SetTextAsync(_dateRange?.ToString(Converter), false);
    }
 
    protected override Task StringValueChanged(string value)
    {
-      Touched = true;
+      Modified = true;
       // Update the daterange property (without updating back the Value property)
       return SetDateRangeAsync(ParseDateRangeValue(value), false);
    }

Components/FileUpload/FileUpload.razor.cs

@@ -109,14 +109,14 @@ public partial class FileUpload<T> : FormComponent<T, string>
       await FilesChanged.InvokeAsync(_value);
       BeginValidate();
       FieldChanged(_value);
-      if (!Error || !SuppressOnChangeWhenInvalid) //only trigger FilesChanged if validation passes or SuppressOnChangeWhenInvalid is false
+      if (!HasError || !SuppressOnChangeWhenInvalid) //only trigger FilesChanged if validation passes or SuppressOnChangeWhenInvalid is false
          await OnFilesChanged.InvokeAsync(args);
    }
 
    protected override void OnInitialized()
    {
-      if (!(typeof(T) == typeof(IReadOnlyList<IBrowserFile>) || typeof(T) == typeof(IBrowserFile)))
+      //if (!(typeof(T) == typeof(IReadOnlyList<IBrowserFile>) || typeof(T) == typeof(IBrowserFile)))
-         Logger.LogWarning("T must be of type {type1} or {type2}", typeof(IReadOnlyList<IBrowserFile>), typeof(IBrowserFile));
+      //   Logger.LogWarning("T must be of type {type1} or {type2}", typeof(IReadOnlyList<IBrowserFile>), typeof(IBrowserFile));
 
       base.OnInitialized();
    }

Components/Form/Form.razor.cs

@@ -206,11 +206,11 @@ public partial class Form : UIComponent, IDisposable, IForm
 		// - none have an error
 		// - all required fields have been touched (and thus validated)
 		var no_errors = _formControls.All(x => x.HasErrors == false);
-		var required_all_touched = _formControls.Where(x => x.Required).All(x => x.Touched);
+		var required_all_touched = _formControls.Where(x => x.Required).All(x => x.Modified);
 		var valid = no_errors && required_all_touched;
 
 		var old_touched = _touched;
-		_touched = _formControls.Any(x => x.Touched);
+		_touched = _formControls.Any(x => x.Modified);
 		try
 		{
 			_shouldRender = false;

Components/Form/FormComponent.cs

@@ -14,13 +14,19 @@ public abstract class FormComponent<T, U> : UIComponent, IFormComponent, IDispos
 {
 	 private Converter<T, U> _converter;
 
+	 /// <summary>
+	 /// Invoked whenever the string value cannot be converted
+	 /// </summary>
+	 public event EventHandler<string> ConversionErrorOccured;
+
 	 protected FormComponent(Converter<T, U> converter)
 	 {
 		  _converter = converter ?? throw new ArgumentNullException(nameof(converter));
-		_converter.OnError = OnConversionError;
+		  _converter.ErrorOccured += (s, e) => OnConversionError(e);
 	 }
 
-	[CascadingParameter] internal IForm Form { get; set; }
+	 [CascadingParameter]
+	 internal IForm? Form { get; set; }
 
 	 /// <summary>
 	 /// If true, this is a top-level form component. If false, this input is a sub-component of another input (i.e. TextField, Select, etc).
@@ -33,77 +39,77 @@ public abstract class FormComponent<T, U> : UIComponent, IFormComponent, IDispos
 	 /// If true, this form input is required to be filled out.
 	 /// </summary>
 	 [Parameter]
-	[Category(CategoryTypes.FormComponent.Validation)]
 	 public bool Required { get; set; }
 
 	 /// <summary>
 	 /// The error text that will be displayed if the input is not filled out but required.
 	 /// </summary>
 	 [Parameter]
-	[Category(CategoryTypes.FormComponent.Validation)]
 	 public string RequiredError { get; set; } = "Required";
 
 	 /// <summary>
-	/// The ErrorText that will be displayed if Error true.
+	 /// The ErrorText that will be displayed if <see cref="HasError"/> is set to true.
 	 /// </summary>
 	 [Parameter]
-	[Category(CategoryTypes.FormComponent.Validation)]
 	 public string ErrorText { get; set; }
 
 	 /// <summary>
 	 /// If true, the label will be displayed in an error state.
 	 /// </summary>
 	 [Parameter]
-	[Category(CategoryTypes.FormComponent.Validation)]
+	 public bool HasError { get; set; }
-	public bool Error { get; set; }
 
 	 /// <summary>
-	/// The ErrorId that will be used by aria-describedby if Error true
+	 /// The ErrorId that will be used by aria-describedby if <see cref="HasError"/> is true
 	 /// </summary>
 	 [Parameter]
-	[Category(CategoryTypes.FormComponent.Validation)]
 	 public string ErrorId { get; set; }
 
 	 /// <summary>
 	 /// The generic converter of the component.
 	 /// </summary>
 	 [Parameter]
-	[Category(CategoryTypes.FormComponent.Behavior)]
 	 public Converter<T, U> Converter
 	 {
 		  get => _converter;
 		  set => SetConverter(value);
 	 }
 
-	protected virtual bool SetConverter(Converter<T, U> value)
-	{
-		var changed = (_converter != value);
-		if (changed)
-		{
-			_converter = value ?? throw new ArgumentNullException(nameof(value));   // converter is mandatory at all times
-			_converter.OnError = OnConversionError;
-		}
-		return changed;
-	}
-
 	 /// <summary>
-	/// The culture of the component.
+	 /// The culture of the component. Also sets the culture of the <see cref="Converter"/> .
 	 /// </summary>
 	 [Parameter]
-	[Category(CategoryTypes.FormComponent.Behavior)]
 	 public CultureInfo Culture
 	 {
 		  get => _converter.Culture;
 		  set => SetCulture(value);
 	 }
 
-	protected virtual bool SetCulture(CultureInfo value)
+	 private string _conversionError { get; set; }
+
+	 protected virtual bool SetConverter(Converter<T, U> value)
 	 {
-		var changed = (_converter.Culture != value);
+		  var changed = _converter != value;
+
 		  if (changed)
 		  {
-			_converter.Culture = value;
+				/*
+             * Converter is mandatory at all times
+             */
+				_converter = value ?? throw new ArgumentNullException(nameof(value));
+				_converter.ErrorOccured += (s, e) => OnConversionError(e);
 		  }
+
+		  return changed;
+	 }
+
+	 protected virtual bool SetCulture(CultureInfo value)
+	 {
+		  var changed = _converter.Culture != value;
+
+		  if (changed)
+				_converter.Culture = value;
+
 		  return changed;
 	 }
 
@@ -111,37 +117,38 @@ public abstract class FormComponent<T, U> : UIComponent, IFormComponent, IDispos
 	 {
 		  // note: we need to update the form here because the conversion error might lead to not updating the value
 		  // ... which leads to not updating the form
-		Touched = true;
-		Form?.Update(this);
-		OnConversionErrorOccurred(error);
-	}
 
-	protected virtual void OnConversionErrorOccurred(string error)
+		  //TODO Why does the form need to be updated?
-	{
+		  Modified = true;
-		/* Descendants can override this method to catch conversion errors */
+
+		  _conversionError = error;
+
+		  Form?.Update(this);
+
+		  ConversionErrorOccured?.Invoke(this, error);
 	 }
 
 	 /// <summary>
 	 /// True if the conversion from string to T failed
 	 /// </summary>
-	public bool ConversionError => _converter.GetError;
+	 public bool ConversionError => !string.IsNullOrWhiteSpace(_conversionError);
 
 	 /// <summary>
 	 /// The error message of the conversion error from string to T. Null otherwise
 	 /// </summary>
-	public string ConversionErrorMessage => _converter.GetErrorMessage;
+	 public string ConversionErrorMessage => _conversionError;
 
 	 /// <summary>
 	 /// True if the input has any of the following errors: An error set from outside, a conversion error or
 	 /// one or more validation errors
 	 /// </summary>
-	public bool HasErrors => Error || ConversionError || ValidationErrors.Count > 0;
+	 public bool HasErrors => HasError || ConversionError || ValidationErrors.Count > 0;
 
 	 /// <summary>
 	 /// Return the validation error text or the conversion error message.
 	 /// </summary>
 	 /// <returns>Error text/message</returns>
-	public string GetErrorText()
+	 public string? GetErrorText()
 	 {
 		  // ErrorText is either set from outside or the first validation error
 		  if (!IsNullOrWhiteSpace(ErrorText))
@@ -154,13 +161,13 @@ public abstract class FormComponent<T, U> : UIComponent, IFormComponent, IDispos
 	 }
 
 	 /// <summary>
-	/// This manages the state of having been "touched" by the user. A form control always starts out untouched
+	 /// This manages the state of having been modified by the user. A form control always starts out unmodified
-	/// but becomes touched when the user performed input or the blur event was raised.
+	 /// but becomes modified when the user performed input or the blur event was raised.
 	 ///
-	/// The touched state is only relevant for inputs that have no value (i.e. empty text fields). Being untouched will
+	 /// The modified state is only relevant for inputs that have no value (i.e. empty text fields). Being unmodified will
-	/// suppress RequiredError
+	 /// suppress the display of the  <see cref="RequiredError"/>
 	 /// </summary>
-	public bool Touched { get; protected set; }
+	 public bool Modified { get; protected set; }
 
 	 #region MudForm Validation
 
@@ -182,10 +189,20 @@ public abstract class FormComponent<T, U> : UIComponent, IFormComponent, IDispos
 	 [Category(CategoryTypes.FormComponent.Validation)]
 	 public object Validation { get; set; }
 
+	 private T __value;
+
 	 /// <summary>
 	 /// This is the form component's value.
 	 /// </summary>
-	protected T _value;
+	 protected T _value
+	 {
+		  get => __value;
+		  set
+		  {
+				__value = value;
+				_conversionError = null;
+		  }
+	 }
 
 	 // These are the fire-and-forget methods to launch an async validation process.
 	 // After each async step, we make sure the current Value of the component has not changed while
@@ -232,7 +249,7 @@ public abstract class FormComponent<T, U> : UIComponent, IFormComponent, IDispos
 		  // when a validation is forced, we must set Touched to true, because for untouched fields with
 		  // no value, validation does nothing due to the way forms are expected to work (display errors
 		  // only after fields have been touched).
-		Touched = true;
+		  Modified = true;
 		  return ValidateValue();
 	 }
 
@@ -284,7 +301,7 @@ public abstract class FormComponent<T, U> : UIComponent, IFormComponent, IDispos
 				// required error (must be last, because it is least important!)
 				if (Required)
 				{
-				if (Touched && !HasValue(_value))
+					 if (Modified && !HasValue(_value))
 						  errors.Add(RequiredError);
 				}
 		  }
@@ -297,7 +314,7 @@ public abstract class FormComponent<T, U> : UIComponent, IFormComponent, IDispos
 					 // if Error and ErrorText are set by the user, setting them here will have no effect.
 					 // if Error, create an error id that can be used by aria-describedby on input control
 					 ValidationErrors = errors;
-				Error = errors.Count > 0;
+					 HasError = errors.Count > 0;
 					 ErrorText = errors.FirstOrDefault();
 					 ErrorId = HasErrors ? Guid.NewGuid().ToString() : null;
 					 Form?.Update(this);
@@ -487,7 +504,8 @@ public abstract class FormComponent<T, U> : UIComponent, IFormComponent, IDispos
 	 {
 		  /* to be overridden */
 		  _value = default;
-		Touched = false;
+		  _conversionError = null;
+		  Modified = false;
 		  StateHasChanged();
 	 }
 
@@ -496,7 +514,7 @@ public abstract class FormComponent<T, U> : UIComponent, IFormComponent, IDispos
 	 /// </summary>
 	 public void ResetValidation()
 	 {
-		Error = false;
+		  HasError = false;
 		  ValidationErrors.Clear();
 		  ErrorText = null;
 		  StateHasChanged();
@@ -527,28 +545,26 @@ public abstract class FormComponent<T, U> : UIComponent, IFormComponent, IDispos
 	 /// <summary>
 	 /// Specify an expression which returns the model's field for which validation messages should be displayed.
 	 /// </summary>
-#nullable enable
 	 [Parameter]
-	[Category(CategoryTypes.FormComponent.Validation)]
 	 public Expression<Func<T>>? For { get; set; }
-#nullable disable
+
 
 	 public bool IsForNull => For == null;
 
+
 	 /// <summary>
 	 /// Stores the list of validation attributes attached to the property targeted by <seealso cref="For"/>. If <seealso cref="For"/> is null, this property is null too.
 	 /// </summary>
-#nullable enable
 	 private IEnumerable<ValidationAttribute>? _validationAttrsFor;
-#nullable disable
+
 
 	 private void OnValidationStateChanged(object sender, ValidationStateChangedEventArgs e)
 	 {
 		  if (EditContext != null && !_fieldIdentifier.Equals(default(FieldIdentifier)))
 		  {
 				var error_msgs = EditContext.GetValidationMessages(_fieldIdentifier).ToArray();
-			Error = error_msgs.Length > 0;
+				HasError = error_msgs.Length > 0;
-			ErrorText = (Error ? error_msgs[0] : null);
+				ErrorText = (HasError ? error_msgs[0] : null);
 				StateHasChanged();
 		  }
 	 }
@@ -561,16 +577,13 @@ public abstract class FormComponent<T, U> : UIComponent, IFormComponent, IDispos
 	 /// <summary>
 	 /// To find out whether or not For parameter has changed we keep a separate reference
 	 /// </summary>
-#nullable enable
 	 private Expression<Func<T>>? _currentFor;
-#nullable disable
+
 
 	 /// <summary>
 	 /// To find out whether or not EditContext parameter has changed we keep a separate reference
 	 /// </summary>
-#nullable enable
 	 private EditContext? _currentEditContext;
-#nullable disable
 
 	 protected override void OnParametersSet()
 	 {

Components/Form/IFormComponent.cs

@@ -3,9 +3,9 @@
 public interface IFormComponent
 {
 	public bool Required { get; set; }
-	public bool Error { get; set; }
+	public bool HasError { get; set; }
 	public bool HasErrors { get; }
-	public bool Touched { get; }
+	public bool Modified { get; }
 	public object Validation { get; set; }
 	public bool IsForNull { get; }
 	public List<string> ValidationErrors { get; set; }

Components/Input/Input.razor

@@ -41,7 +41,7 @@
                 @onkeyup:preventDefault="@KeyUpPreventDefault"
                 @onmousewheel="@OnMouseWheel" 
                 @onwheel="@OnMouseWheel"
-                aria-invalid="@Error.ToString().ToLower()"
+                aria-invalid="@HasError.ToString().ToLower()"
                 aria-describedby="@ErrorId"
         > 
             @Text
@@ -73,7 +73,7 @@
                 @onkeyup:preventDefault="@KeyUpPreventDefault"
                 @onmousewheel="@OnMouseWheel" 
                 @onwheel="@OnMouseWheel"
-                aria-invalid="@Error.ToString().ToLower()"
+                aria-invalid="@HasError.ToString().ToLower()"
                 aria-describedby="@ErrorId"
          />
 	     @*Note: double mouse wheel handlers needed for Firefox because it doesn't know onmousewheel*@

Components/Input/InputBase.cs

@@ -215,7 +215,7 @@ public abstract class InputBase<T> : FormComponent<T, string>
       {
          Text = text;
          if (!string.IsNullOrWhiteSpace(Text))
-            Touched = true;
+            Modified = true;
          if (updateValue)
             await UpdateValuePropertyAsync(false);
          await TextChanged.InvokeAsync(Text);
@@ -227,7 +227,7 @@ public abstract class InputBase<T> : FormComponent<T, string>
    /// </summary>
    protected virtual Task UpdateTextPropertyAsync(bool updateValue)
    {
-      return SetTextAsync(Converter.Set(Value), updateValue);
+      return SetTextAsync(Converter.Convert(Value), updateValue);
    }
 
    /// <summary>
@@ -266,7 +266,7 @@ public abstract class InputBase<T> : FormComponent<T, string>
 
       if (!OnlyValidateIfDirty || _isDirty)
       {
-         Touched = true;
+         Modified = true;
          BeginValidateAfter(OnBlur.InvokeAsync(obj));
       }
    }
@@ -361,7 +361,7 @@ public abstract class InputBase<T> : FormComponent<T, string>
    /// </summary>
    protected virtual Task UpdateValuePropertyAsync(bool updateText)
    {
-      return SetValueAsync(Converter.Get(Text), updateText);
+      return SetValueAsync(Converter.ConvertBack(Text), updateText);
    }
 
    protected override bool SetConverter(Converter<T, string> value)
@@ -389,7 +389,7 @@ public abstract class InputBase<T> : FormComponent<T, string>
    [Category(CategoryTypes.FormComponent.Behavior)]
    public string Format
    {
-      get => ((Converter<T>)Converter).Format;
+      get => ((ToStringConverter<T>)Converter).Format;
       set => SetFormat(value);
    }
 
@@ -398,7 +398,7 @@ public abstract class InputBase<T> : FormComponent<T, string>
       var changed = Format != value;
       if (changed)
       {
-         ((Converter<T>)Converter).Format = value;
+         ((ToStringConverter<T>)Converter).Format = value;
          UpdateTextPropertyAsync(false).AndForget();      // refresh only Text property from current Value
       }
       return changed;

Components/Mask/Mask.razor.cs

@@ -238,7 +238,7 @@ public partial class Mask : InputBase<string>, IDisposable
          await base.SetTextAsync(text, updateValue: false);
          if (Clearable)
             UpdateClearable(Text);
-         var v = Converter.Get(cleanText);
+         var v = Converter.ConvertBack(cleanText);
          Value = v;
          await ValueChanged.InvokeAsync(v);
          SetCaretPosition(caret, selection);
@@ -262,7 +262,7 @@ public partial class Mask : InputBase<string>, IDisposable
       // allow this only via changes from the outside
       if (_updating)
          return;
-      var text = Converter.Set(Value);
+      var text = Converter.Convert(Value);
       var cleanText = MaskKind.GetCleanText();
       if (cleanText == text || string.IsNullOrEmpty(cleanText) && string.IsNullOrEmpty(text))
          return;

Components/NumericField/NumericField.razor

@@ -39,7 +39,7 @@
                           AdornmentIcon="@AdornmentIcon"
                           AdornmentColor="@AdornmentColor"
                           IconSize="@IconSize"
-                          Error="@Error"
+                          Error="@HasError"
                           Immediate="@(Immediate)"
                           Margin="@Margin"
                           MaxLength="@MaxLength"

Components/Picker/Picker.razor

@@ -31,7 +31,7 @@
              Margin="@Margin" 
              Required="@Required" 
              RequiredError="@RequiredError" 
-             Error="@Error" 
+             Error="@HasError" 
              ErrorText="@ErrorText"
              Clearable="@(ReadOnly ? false : Clearable)"
              OnClearButtonClick="@(() => Clear())"

Components/Radio/RadioGroup.razor.cs

@@ -81,7 +81,7 @@ public partial class RadioGroup<T> : FormComponent<T, T>, IRadioGroup
 
    internal Task SetSelectedRadioAsync(Radio<T> radio)
    {
-      Touched = true;
+      Modified = true;
       return SetSelectedRadioAsync(radio, true);
    }
 

Components/Select/Select.razor

@@ -5,14 +5,14 @@
 <CascadingValue Name="SubscribeToParentForm" Value="false" IsFixed="true">
 	<div class="mud-select" id="@_elementId">
 		<InputControl Label="@Label" Variant="@Variant" HelperText="@HelperText" HelperTextOnFocus="@HelperTextOnFocus" FullWidth="@FullWidth" Margin="@Margin" Class="@Classname" Style="@Style"
-						 Error="@Error" ErrorText="@ErrorText" ErrorId="@ErrorId" Disabled="@Disabled" @onclick="@ToggleMenu" Required="@Required" ForId="@FieldId">
+						 Error="@HasError" ErrorText="@ErrorText" ErrorId="@ErrorId" Disabled="@Disabled" @onclick="@ToggleMenu" Required="@Required" ForId="@FieldId">
 			<InputContent>
                 <Input @ref="_elementReference" InputType="@(CanRenderValue || (Strict && !IsValueInList) ? InputType.Hidden : InputType.Text)"
                           Class="mud-select-input" Margin="@Margin" Placeholder="@Placeholder"
                           Variant="@Variant"
                           TextUpdateSuppression="false"
                           Value="@(Strict && !IsValueInList ? null : Text)" DisableUnderLine="@DisableUnderLine"
-                          Disabled="@Disabled" ReadOnly="true" Error="@Error" ErrorId="@ErrorId"
+                          Disabled="@Disabled" ReadOnly="true" Error="@HasError" ErrorId="@ErrorId"
                           OnAdornmentClick="@OnAdornmentClick" AdornmentIcon="@_currentIcon" Adornment="@Adornment"
                           AdornmentColor="@AdornmentColor" IconSize="@IconSize" AdornmentText="@AdornmentText"
                           Clearable="@Clearable" OnClearButtonClick="(async (e) => await SelectClearButtonClickHandlerAsync(e))"

Components/Select/Select.razor.cs

@@ -86,12 +86,12 @@ public partial class Select<T> : InputBase<T>, ISelect, IShadowSelect
 			// find first item that starts with the letter
 			var currentItem = items.FirstOrDefault(x => x.ItemId == (string)_activeItemId);
 			if (currentItem != null &&
-            Converter.Set(currentItem.Value)?.ToLowerInvariant().StartsWith(startChar) == true)
+			   Converter.Convert(currentItem.Value)?.ToLowerInvariant().StartsWith(startChar) == true)
 			{
 				// this will step through all items that start with the same letter if pressed multiple times
 				items = items.SkipWhile(x => x != currentItem).Skip(1);
 			}
-         items = items.Where(x => Converter.Set(x.Value)?.ToLowerInvariant().StartsWith(startChar) == true);
+			items = items.Where(x => Converter.Convert(x.Value)?.ToLowerInvariant().StartsWith(startChar) == true);
 		}
 		var item = items.FirstOrDefault();
 		if (item == null)
@@ -244,13 +244,13 @@ public partial class Select<T> : InputBase<T>, ISelect, IShadowSelect
 				//Warning. Here the Converter was not set yet
 				if (MultiSelectionTextFunc != null)
 				{
-               SetCustomizedTextAsync(string.Join(Delimiter, SelectedValues.Select(x => Converter.Set(x))),
+					SetCustomizedTextAsync(string.Join(Delimiter, SelectedValues.Select(x => Converter.Convert(x))),
-                  selectedConvertedValues: SelectedValues.Select(x => Converter.Set(x)).ToList(),
+					   selectedConvertedValues: SelectedValues.Select(x => Converter.Convert(x)).ToList(),
 					   multiSelectionTextFunc: MultiSelectionTextFunc).AndForget();
 				}
 				else
 				{
-               SetTextAsync(string.Join(Delimiter, SelectedValues.Select(x => Converter.Set(x))), updateValue: false).AndForget();
+					SetTextAsync(string.Join(Delimiter, SelectedValues.Select(x => Converter.Convert(x))), updateValue: false).AndForget();
 				}
 			}
 			SelectedValuesChanged.InvokeAsync(new HashSet<T>(SelectedValues, _comparer));
@@ -293,11 +293,7 @@ public partial class Select<T> : InputBase<T>, ISelect, IShadowSelect
 			if (_toStringFunc == value)
 				return;
 			_toStringFunc = value;
-         Converter = new Converter<T>
+			Converter = new LambdaConverter<T, string>(_toStringFunc ?? (x => x?.ToString()), null);
-         {
-            SetFunc = _toStringFunc ?? (x => x?.ToString()),
-            //GetFunc = LookupValue,
-         };
 		}
 	}
 
@@ -393,15 +389,15 @@ public partial class Select<T> : InputBase<T>, ISelect, IShadowSelect
 		if (MultiSelectionTextFunc != null)
 		{
 			return MultiSelection
-            ? SetCustomizedTextAsync(string.Join(Delimiter, SelectedValues.Select(x => Converter.Set(x))),
+			   ? SetCustomizedTextAsync(string.Join(Delimiter, SelectedValues.Select(x => Converter.Convert(x))),
-               selectedConvertedValues: SelectedValues.Select(x => Converter.Set(x)).ToList(),
+				  selectedConvertedValues: SelectedValues.Select(x => Converter.Convert(x)).ToList(),
 				  multiSelectionTextFunc: MultiSelectionTextFunc)
 			   : base.UpdateTextPropertyAsync(updateValue);
 		}
 		else
 		{
 			return MultiSelection
-            ? SetTextAsync(string.Join(Delimiter, SelectedValues.Select(x => Converter.Set(x))))
+			   ? SetTextAsync(string.Join(Delimiter, SelectedValues.Select(x => Converter.Convert(x))))
 			   : base.UpdateTextPropertyAsync(updateValue);
 		}
 	}
@@ -568,13 +564,13 @@ public partial class Select<T> : InputBase<T>, ISelect, IShadowSelect
 
 			if (MultiSelectionTextFunc != null)
 			{
-            await SetCustomizedTextAsync(string.Join(Delimiter, SelectedValues.Select(x => Converter.Set(x))),
+				await SetCustomizedTextAsync(string.Join(Delimiter, SelectedValues.Select(x => Converter.Convert(x))),
-               selectedConvertedValues: SelectedValues.Select(x => Converter.Set(x)).ToList(),
+				   selectedConvertedValues: SelectedValues.Select(x => Converter.Convert(x)).ToList(),
 				   multiSelectionTextFunc: MultiSelectionTextFunc);
 			}
 			else
 			{
-            await SetTextAsync(string.Join(Delimiter, SelectedValues.Select(x => Converter.Set(x))), updateValue: false);
+				await SetTextAsync(string.Join(Delimiter, SelectedValues.Select(x => Converter.Convert(x))), updateValue: false);
 			}
 
 			UpdateSelectAllChecked();
@@ -811,7 +807,7 @@ public partial class Select<T> : InputBase<T>, ISelect, IShadowSelect
 		{
 			multiSelectionText = text;
 			if (!string.IsNullOrWhiteSpace(multiSelectionText))
-            Touched = true;
+				Modified = true;
 			if (updateValue)
 				await UpdateValuePropertyAsync(false);
 			await TextChanged.InvokeAsync(multiSelectionText);
@@ -1004,13 +1000,13 @@ public partial class Select<T> : InputBase<T>, ISelect, IShadowSelect
 		_selectedValues = new HashSet<T>(selectedValues, _comparer);
 		if (MultiSelectionTextFunc != null)
 		{
-         await SetCustomizedTextAsync(string.Join(Delimiter, SelectedValues.Select(x => Converter.Set(x))),
+			await SetCustomizedTextAsync(string.Join(Delimiter, SelectedValues.Select(x => Converter.Convert(x))),
-            selectedConvertedValues: SelectedValues.Select(x => Converter.Set(x)).ToList(),
+			   selectedConvertedValues: SelectedValues.Select(x => Converter.Convert(x)).ToList(),
 			   multiSelectionTextFunc: MultiSelectionTextFunc);
 		}
 		else
 		{
-         await SetTextAsync(string.Join(Delimiter, SelectedValues.Select(x => Converter.Set(x))), updateValue: false);
+			await SetTextAsync(string.Join(Delimiter, SelectedValues.Select(x => Converter.Convert(x))), updateValue: false);
 		}
 		UpdateSelectAllChecked();
 		_selectedValues = selectedValues; // need to force selected values because Blazor overwrites it under certain circumstances due to changes of Text or Value

Components/Select/SelectItem.razor.cs

@@ -129,7 +129,7 @@ public partial class SelectItem<T> : SelectItemBase, IDisposable
          var converter = Select?.Converter;
          if (converter == null)
             return $"{Value}";
-         return converter.Set(Value);
+         return converter.Convert(Value);
       }
    }
 

Components/Slider/Slider.razor.cs

@@ -28,8 +28,8 @@ public partial class Slider<T> : UIComponent
    [Category(CategoryTypes.Slider.Validation)]
    public T Min
    {
-      get => Converter.Get(_min);
+      get => Converter.ConvertBack(_min);
-      set => _min = Converter.Set(value);
+      set => _min = Converter.Convert(value);
    }
 
    /// <summary>
@@ -40,8 +40,8 @@ public partial class Slider<T> : UIComponent
    [Category(CategoryTypes.Slider.Validation)]
    public T Max
    {
-      get => Converter.Get(_max);
+      get => Converter.ConvertBack(_max);
-      set => _max = Converter.Set(value);
+      set => _max = Converter.Convert(value);
    }
 
    /// <summary>
@@ -52,8 +52,8 @@ public partial class Slider<T> : UIComponent
    [Category(CategoryTypes.Slider.Validation)]
    public T Step
    {
-      get => Converter.Get(_step);
+      get => Converter.ConvertBack(_step);
-      set => _step = Converter.Set(value);
+      set => _step = Converter.Convert(value);
    }
 
    /// <summary>
@@ -73,7 +73,7 @@ public partial class Slider<T> : UIComponent
 
    [Parameter]
    [Category(CategoryTypes.Slider.Behavior)]
-   public Converter<T> Converter { get; set; } = new DefaultConverter<T>() { Culture = CultureInfo.InvariantCulture };
+   public ToStringConverter<T> Converter { get; set; } = new DefaultConverter<T>() { Culture = CultureInfo.InvariantCulture };
 
    [Parameter] public EventCallback<T> ValueChanged { get; set; }
 
@@ -81,10 +81,10 @@ public partial class Slider<T> : UIComponent
    [Category(CategoryTypes.Slider.Data)]
    public T Value
    {
-      get => Converter.Get(_value);
+      get => Converter.ConvertBack(_value);
       set
       {
-         var d = Converter.Set(value);
+         var d = Converter.Convert(value);
          if (_value == d)
             return;
          _value = d;

Components/TextField/TextField.razor

@@ -9,7 +9,7 @@
                      HelperTextOnFocus="@HelperTextOnFocus"
                      CounterText="@GetCounterText()"
                      FullWidth="@FullWidth"
-                     Class="@Classname"
+                     Class="@ClassList"
                      Error="@HasErrors"
                      ErrorText="@GetErrorText()"
                      ErrorId="@ErrorId"
@@ -43,7 +43,7 @@
                               AdornmentAriaLabel="@AdornmentAriaLabel"
                               IconSize="@IconSize"
                               OnAdornmentClick="@OnAdornmentClick"
-                              Error="@Error"
+                              Error="@HasError"
                               ErrorId="@ErrorId"
                               Immediate="@Immediate"
                               Margin="@Margin"
@@ -83,7 +83,7 @@
                              AdornmentColor="@AdornmentColor"
                              IconSize="@IconSize"
                              OnAdornmentClick="@OnAdornmentClick"
-                             Error="@Error"
+                             Error="@HasError"
                              Immediate="@Immediate"
                              Margin="@Margin" OnBlur="@OnBlurred"
                              Clearable="@Clearable"

Components/TextField/TextField.razor.cs

@@ -7,13 +7,9 @@ namespace Connected.Components;
 
 public partial class TextField<T> : DebouncedInput<T>
 {
-	protected string Classname =>
+    private Mask? _maskReference;
-		new CssBuilder("mud-input-input-control")
-		.AddClass(Class)
-		.Build();
 
 	public Input<string> InputReference { get; private set; }
-	private Mask _maskReference;
 
 	/// <summary>
 	/// Type of the input element. It should be a valid HTML5 input type.
@@ -38,6 +34,11 @@ public partial class TextField<T> : DebouncedInput<T>
 	/// </summary>
 	[Parameter] public EventCallback<MouseEventArgs> OnClearButtonClick { get; set; }
 
+    protected string ClassList =>
+		new CssBuilder("mud-input-input-control")
+		.AddClass(Class)
+		.Build();
+
 	public override ValueTask FocusAsync()
 	{
 		if (_mask == null)
@@ -130,10 +131,10 @@ public partial class TextField<T> : DebouncedInput<T>
 	{
 		if (_mask != null)
 		{
-			var textValue = Converter.Set(value);
+			var textValue = Converter.Convert(value);
 			_mask.SetText(textValue);
 			textValue = Mask.GetCleanText();
-			value = Converter.Get(textValue);
+			value = Converter.ConvertBack(textValue);
 		}
 		return base.SetValueAsync(value, updateText);
 	}

Components/TimePicker/TimePicker.razor.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Dynamic;
 using System.Globalization;
 using System.Text.RegularExpressions;
 using Connected.Annotations;
@@ -14,11 +15,13 @@ public partial class TimePicker : Picker<TimeSpan?>
 	private const string format24Hours = "HH:mm";
 	private const string format12Hours = "hh:mm tt";
 
-	public TimePicker() : base(new DefaultConverter<TimeSpan?>())
+
+	public TimePicker() : base()
 	{
-		Converter.GetFunc = OnGet;
+		_timeFormat = format24Hours;
-		Converter.SetFunc = OnSet;
+
-		((DefaultConverter<TimeSpan?>)Converter).Format = format24Hours;
+		Converter = new LambdaConverter<TimeSpan?, string>((e) => OnSet(e), (e) => OnGet(e));
+
 		AdornmentIcon = Icons.Material.Filled.AccessTime;
 		AdornmentAriaLabel = "Open Time Picker";
 	}
@@ -30,7 +33,7 @@ public partial class TimePicker : Picker<TimeSpan?>
 
 		var time = DateTime.Today.Add(timespan.Value);
 
-		return time.ToString(((DefaultConverter<TimeSpan?>)Converter).Format, Culture);
+		return time.ToString(_timeFormat, Culture);
 	}
 
 	private TimeSpan? OnGet(string value)
@@ -38,7 +41,7 @@ public partial class TimePicker : Picker<TimeSpan?>
 		if (string.IsNullOrEmpty(value))
 			return null;
 
-		if (DateTime.TryParseExact(value, ((DefaultConverter<TimeSpan?>)Converter).Format, Culture, DateTimeStyles.None, out var time))
+		if (DateTime.TryParseExact(value, _timeFormat, Culture, DateTimeStyles.None, out var time))
 		{
 			return time.TimeOfDay;
 		}
@@ -105,13 +108,10 @@ public partial class TimePicker : Picker<TimeSpan?>
 
 			_amPm = value;
 
-			if (Converter is DefaultConverter<TimeSpan?> defaultConverter && string.IsNullOrWhiteSpace(_timeFormat))
+			_timeFormat = AmPm ? format12Hours : format24Hours;
-			{
-				defaultConverter.Format = AmPm ? format12Hours : format24Hours;
-			}
 
-			Touched = true;
+			Modified = true;
-			SetTextAsync(Converter.Set(_value), false).AndForget();
+			SetTextAsync(Converter.Convert(_value), false).AndForget();
 		}
 	}
 
@@ -129,11 +129,9 @@ public partial class TimePicker : Picker<TimeSpan?>
 				return;
 
 			_timeFormat = value;
-			if (Converter is DefaultConverter<TimeSpan?> defaultConverter)
-				defaultConverter.Format = _timeFormat;
 		
-			Touched = true;
+			Modified = true;
-			SetTextAsync(Converter.Set(_value), false).AndForget();
+			SetTextAsync(Converter.Convert(_value), false).AndForget();
 		}
 	}
 
@@ -155,7 +153,7 @@ public partial class TimePicker : Picker<TimeSpan?>
 			TimeIntermediate = time;
 			_value = time;
 			if (updateValue)
-				await SetTextAsync(Converter.Set(_value), false);
+				await SetTextAsync(Converter.Convert(_value), false);
 			UpdateTimeSetFromTime();
 			await TimeChanged.InvokeAsync(_value);
 			BeginValidate();
@@ -170,9 +168,9 @@ public partial class TimePicker : Picker<TimeSpan?>
 
 	protected override Task StringValueChanged(string value)
 	{
-		Touched = true;
+		Modified = true;
 		// Update the time property (without updating back the Value property)
-		return SetTimeAsync(Converter.Get(value), false);
+		return SetTimeAsync(Converter.ConvertBack(value), false);
 	}
 
 	//The last line cannot be tested

Components/TreeView/TreeViewItem.razor.cs

@@ -12,7 +12,7 @@ public partial class TreeViewItem<T> : UIComponent
    private string _text;
    private bool _disabled;
    private bool _isChecked, _isSelected, _isServerLoaded;
-   private Converter<T> _converter = new DefaultConverter<T>();
+   private ToStringConverter<T> _converter = new DefaultConverter<T>();
    private readonly List<TreeViewItem<T>> _childItems = new();
 
    protected string Classname =>
@@ -68,7 +68,7 @@ public partial class TreeViewItem<T> : UIComponent
    [Category(CategoryTypes.TreeView.Behavior)]
    public string Text
    {
-      get => string.IsNullOrEmpty(_text) ? _converter.Set(Value) : _text;
+      get => string.IsNullOrEmpty(_text) ? _converter.Convert(Value) : _text;
       set => _text = value;
    }