Merge pull request #43 from GokceOzkan/master

DatePicker update issue #37
siemens · Mar 28, 2024 · cfa424c · cfa424c
2 parents 162ad20 + c4f18de
commit cfa424c
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 16 deletions.
diff --git a/SiemensIXBlazor/Components/DatePicker/DatePicker.razor b/SiemensIXBlazor/Components/DatePicker/DatePicker.razor
@@ -5,17 +5,17 @@
 @inject IJSRuntime JSRuntime
 @inherits IXBaseComponent
 
-<ix-date-picker
-@attributes="UserAttributes"
-id="@Id" 
-from="@From" 
-to="@To"
-corners="@(EnumParser<DatePickerCorners>.ParseEnumToString(Corners))"
-event-delimiter="@EventDelimiter"
-format="@Format"
-max-date="@MaxDate"
-min-date="@MinDate"
-range="@Range"
-text-select-date="@TextSelectDate"
-style="@Style"
-class="@Class"></ix-date-picker>
+<ix-date-picker @attributes="UserAttributes"
+                id="@Id"
+                from="@From"
+                to="@To"
+                corners="@(EnumParser<DatePickerCorners>.ParseEnumToString(Corners))"
+                format="@Format"
+                max-date="@MaxDate"
+                min-date="@MinDate"
+                range="@Range"
+                locale="@Locale"
+                i18n-done="@I18nDone"
+                week-start-index="@WeekStartIndex"
+                style="@Style"
+                class="@Class"></ix-date-picker>
diff --git a/SiemensIXBlazor/Components/DatePicker/DatePicker.razor.cs b/SiemensIXBlazor/Components/DatePicker/DatePicker.razor.cs
@@ -19,20 +19,27 @@ public partial class DatePicker
         [Parameter]
         public static string Format { get; set; } = "yyyy/MM/dd";
         [Parameter]
-        public string From { get; set; } = DateTime.Now.ToString(Format);
+        public string? From { get; set; } 
         [Parameter]
         public string? MaxDate { get; set; }
         [Parameter]
         public string? MinDate { get; set; }
         [Parameter]
         public bool Range { get; set; } = true;
         [Parameter]
-        public string TextSelectDate { get; set; } = "Done";
+        public string I18nDone { get; set; } = "Done";
+        [Parameter]
+        public string? Locale { get; set; }
+        [Parameter]
+        public int WeekStartIndex { get; set; } = 0;
         [Parameter]
         public string? To { get; set; }
         [Parameter]
         public EventCallback<DatePickerResponse?> DateRangeChangeEvent { get; set; }
         [Parameter]
+        public EventCallback<DatePickerResponse?> DateChangeEvent { get; set; }
+        [Parameter]
+
         public EventCallback<DatePickerResponse> DateSelectEvent { get; set; }
 
         private BaseInterop _interop;
@@ -43,6 +50,7 @@ protected async override Task OnAfterRenderAsync(bool firstRender)
             {
                 _interop = new(JSRuntime);
 
+                await _interop.AddEventListener(this, Id, "dateChange", "DateChange");
                 await _interop.AddEventListener(this, Id, "dateRangeChange", "DateRangeChange");
                 await _interop.AddEventListener(this, Id, "dateSelect", "DateSelect");
             }
@@ -57,6 +65,16 @@ public async void DateRangeChange(JsonElement data)
             await DateRangeChangeEvent.InvokeAsync(jsonData);
         }
 
+
+        [JSInvokable]
+        public async void DateChange(JsonElement data)
+        {
+            string jsonDataText = data.GetRawText();
+            DatePickerResponse? jsonData = JObject.Parse(jsonDataText)
+                                                  .ToObject<DatePickerResponse>();
+            await DateChangeEvent.InvokeAsync(jsonData);
+        }
+
         [JSInvokable]
         public async void DateSelect(JsonElement data)
         {