refactor to remove MudWheel redundant declarations (#66)

Author: GioviQ

CodeBeam.MudExtensions/Components/DateWheelPicker/MudDateWheelPicker.razor

@@ -7,8 +7,7 @@
         <MudInputControl 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="@(Editable ? null : ToggleMenu)" Required="@Required" ForId="@FieldId">
             <InputContent>
-                <MudInput 
-                          @ref="InputReference" Margin="@Margin" Placeholder="@Placeholder"
+                <MudInput @ref="InputReference" Margin="@Margin" Placeholder="@Placeholder"
                           Variant="@Variant" InputType="InputType.Text"
                           TextUpdateSuppression="false"
                           Value="@(Text)" DisableUnderLine="@DisableUnderLine"
@@ -33,30 +32,28 @@
                             }
                         </div>
                     }
-                    
+
                     <div class="d-flex">
                         @if (DateView == DateView.Date || DateView == DateView.Both)
                         {
-                            int yearIndex = DateFormat.IndexOf('y');
-                            int monthIndex = DateFormat.IndexOf('M');
-                            int dayIndex = DateFormat.IndexOf('d');
-                            @if (yearIndex < dayIndex)
-                            {
-                                <MudWheel Class="mud-width-full" @bind-Value="_year" ItemCollection="Years" Sensitivity="@Sensitivity" Label="@(ShowHeader ? LocalizedStrings.Year : null)" Dense="@Dense" Color="@Color" Disabled="FixYear" />
-                                <MudWheel Class="mud-width-full" Value="_month" ValueChanged=@((int m) => OnMonthChanged(m)) ItemCollection="Months" Sensitivity="@Sensitivity" Label="@(ShowHeader ? LocalizedStrings.Month : null)" ToStringFunc="new Func<int, string>(NumberToString)" Dense="@Dense" Color="@Color" Disabled="FixMonth" />
-                                <MudWheel Class="mud-width-full" @bind-Value="_day" ItemCollection="Days" Sensitivity="@Sensitivity" Label="@(ShowHeader ? LocalizedStrings.Day : null)" ToStringFunc="new Func<int, string>(NumberToString)" Dense="@Dense" Color="@Color" Disabled="FixDay" />
-                            }
-                            else if (monthIndex < dayIndex && dayIndex < yearIndex )
-                            {
-                                <MudWheel Class="mud-width-full" Value="_month" ValueChanged=@((int m) => OnMonthChanged(m)) ItemCollection="Months" Sensitivity="@Sensitivity" Label="@(ShowHeader ? LocalizedStrings.Month : null)" ToStringFunc="new Func<int, string>(NumberToString)" Dense="@Dense" Color="@Color" Disabled="FixMonth" />
-                                <MudWheel Class="mud-width-full" @bind-Value="_day" ItemCollection="Days" Sensitivity="@Sensitivity" Label="@(ShowHeader ? LocalizedStrings.Day : null)" ToStringFunc="new Func<int, string>(NumberToString)" Dense="@Dense" Color="@Color" Disabled="FixDay" />
-                                <MudWheel Class="mud-width-full" @bind-Value="_year" ItemCollection="Years" Sensitivity="@Sensitivity" Label="@(ShowHeader ? LocalizedStrings.Year : null)" Dense="@Dense" Color="@Color" Disabled="FixYear" />
-                            }
-                            else
+                            string dateFormat = new string(DateFormat);
+
+                            while (dateFormat.Length > 0)
                             {
-                                <MudWheel Class="mud-width-full" @bind-Value="_day" ItemCollection="Days" Sensitivity="@Sensitivity" Label="@(ShowHeader ? LocalizedStrings.Day : null)" ToStringFunc="new Func<int, string>(NumberToString)" Dense="@Dense" Color="@Color" Disabled="FixDay" />
-                                <MudWheel Class="mud-width-full" Value="_month" ValueChanged=@((int m) => OnMonthChanged(m)) ItemCollection="Months" Sensitivity="@Sensitivity" Label="@(ShowHeader ? LocalizedStrings.Month : null)" ToStringFunc="new Func<int, string>(NumberToString)" Dense="@Dense" Color="@Color" Disabled="FixMonth" />
-                                <MudWheel Class="mud-width-full" @bind-Value="_year" ItemCollection="Years" Sensitivity="@Sensitivity" Label="@(ShowHeader ? LocalizedStrings.Year : null)" Dense="@Dense" Color="@Color" Disabled="FixYear" />
+                                switch (dateFormat[0])
+                                {
+                                    case 'd':
+                                        <MudWheel Class="mud-width-full" @bind-Value="_day" ItemCollection="Days" Sensitivity="@Sensitivity" Label="@(ShowHeader ? LocalizedStrings.Day : null)" ToStringFunc="new Func<int, string>(NumberToString)" Dense="@Dense" Color="@Color" Disabled="FixDay" />
+                                        break;
+                                    case 'M':
+                                        <MudWheel Class="mud-width-full" Value="_month" ValueChanged=@((int m) => OnMonthChanged(m)) ItemCollection="Months" Sensitivity="@Sensitivity" Label="@(ShowHeader ? LocalizedStrings.Month : null)" ToStringFunc="new Func<int, string>(NumberToString)" Dense="@Dense" Color="@Color" Disabled="FixMonth" />
+                                        break;
+                                    case 'y':
+                                        <MudWheel Class="mud-width-full" @bind-Value="_year" ItemCollection="Years" Sensitivity="@Sensitivity" Label="@(ShowHeader ? LocalizedStrings.Year : null)" Dense="@Dense" Color="@Color" Disabled="FixYear" />
+                                        break;
+                                }
+
+                                dateFormat = dateFormat.Replace(dateFormat[0].ToString(), string.Empty);
                             }
                         }
                         @if (DateView == DateView.Time || DateView == DateView.Both)

CodeBeam.MudExtensions/Components/DateWheelPicker/MudDateWheelPicker.razor.cs

@@ -376,11 +376,7 @@ protected bool HasSeconds()
 
         protected string NumberToString(int val)
         {
-            if (val < 10)
-            {
-                return $"0{val}";
-            }
-            return val.ToString();
+            return $"{val:00}";
         }
 
         /// <summary>