@acpaas-ui/ngx-forms 6.1.6 → 6.1.7

package/fesm2020/acpaas-ui-ngx-forms.mjs

@@ -12,6 +12,7 @@ import { get, isEqual, debounce } from 'lodash-es';
 import { Subject, Observable } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { DateHelper, IntervalBuilder } from '@acpaas-ui/ngx-utils';
+import { TZDate } from '@date-fns/tz';
 import * as i1$2 from '@acpaas-ui/ngx-calendar';
 import { CALENDAR_DEFAULT_MONTH_LABELS, CALENDAR_DEFAULT_WEEKDAY_LABELS, CALENDAR_MONTH_LABELS, CALENDAR_WEEKDAY_LABELS, CalendarModule } from '@acpaas-ui/ngx-calendar';
 import * as i4$1 from '@acpaas-ui/ngx-icon';
@@ -483,13 +484,13 @@ class DatepickerComponent {
                 const date = DateHelper.parseDate(format, 'yyyy-MM-dd');
                 if (date) {
                     this.selectedDate = date;
-                    const year = date.getFullYear();
-                    const month = date.getMonth();
-                    const day = date.getDate();
+                    const brusselsDate = new TZDate(date, 'Europe/Brussels');
+                    const year = brusselsDate.getFullYear();
+                    const month = brusselsDate.getMonth();
+                    const day = brusselsDate.getDate();
                     this.onChange(DateHelper.toUtcMidnightInBrussels(year, month, day));
                 }
                 else {
-                    // Change value with original value (and not null or '') so we can add an error in the validate function
                     this.onChange(value);
                 }
             }
@@ -518,12 +519,20 @@ class DatepickerComponent {
             .build();
     }
     writeValue(value) {
-        this.selectedDate =
-            typeof value === 'string'
-                ? this.isISODateFormat(value)
-                    ? new Date(value)
-                    : DateHelper.parseDate(value, 'dd/MM/yyyy')
-                : value;
+        if (typeof value === 'string') {
+            if (this.isISODateFormat(value)) {
+                this.selectedDate = DateHelper.parseDate(value);
+            }
+            else {
+                this.selectedDate = DateHelper.parseDate(value, 'dd/MM/yyyy');
+            }
+        }
+        else if (value instanceof Date) {
+            this.selectedDate = value;
+        }
+        else {
+            this.selectedDate = null;
+        }
         const dateString = this.selectedDate ? this.formatDate(this.selectedDate) : '';
         this.formControl.setValue(dateString);
     }