@everymatrix/stage-dm-range-date-picker 1.0.31 → 1.0.32

package/component-lib.js

@@ -67274,22 +67274,22 @@ var DmRangeDatePickerLibComponent = class _DmRangeDatePickerLibComponent {
     this.elementRef = elementRef;
     this.shadowDomStyleInjectorService = shadowDomStyleInjectorService;
     this.dateControl.valueChanges.subscribe((dates) => {
-      if (!dates || !dates[0] || !dates[1] && this.requireEndDate) {
-        return;
-      }
-      if (this.manualDateChange) {
-        this.currentAlias = TimePeriod.Custom;
-        this.manualDateChange = false;
-      }
+      const start = Array.isArray(dates) && this.isDateValid(dates[0]);
+      const end = Array.isArray(dates) && this.isDateValid(dates[1]);
+      const parsed = [];
+      if (start)
+        parsed.push(dates[0]);
+      if (start && end)
+        parsed.push(dates[1]);
       const rangeValue = {
         alias: this.currentAlias ?? "custom",
         start: dates?.[0] ?? null,
         end: dates?.[1] ?? null
       };
-      this.inputValue = this.formatDateRange(dates ?? []);
-      this.onChangeFn(rangeValue);
+      this.inputValue = this.formatDateRange(parsed);
+      this.onChangeFn(parsed.length ? rangeValue : null);
       this.elementRef.nativeElement.dispatchEvent(new CustomEvent("dm-range-date-picker-changed", {
-        detail: rangeValue,
+        detail: parsed.length ? rangeValue : null,
         bubbles: true,
         composed: true
       }));
@@ -67337,19 +67337,23 @@ var DmRangeDatePickerLibComponent = class _DmRangeDatePickerLibComponent {
     return this.requireEndDate ? endDateRequired(control) : null;
   }
   writeValue(value) {
-    if (!value || typeof value !== "object" || !("alias" in value) || value.alias == "custom" && (!value.start || !value.end && this.requireEndDate)) {
+    if (!value || typeof value !== "object" || !("alias" in value) || !value.alias) {
       this.inputValue = "";
-      this._initialValue = null;
       this.dateControl.setValue(null, { emitEvent: false });
       return;
     }
-    this._initialValue = value;
     if (value.alias !== "custom") {
       this.onListSelect(value.alias);
     } else {
-      this.currentAlias = TimePeriod.Custom;
-      const parsed = [new Date(value.start), new Date(value.end)];
-      this.dateControl.setValue(parsed, { emitEvent: false });
+      const start = this.isDateValid(value.start);
+      const end = this.isDateValid(value.end);
+      const parsed = [];
+      if (start)
+        parsed.push(value.start);
+      if (start && end)
+        parsed.push(value.end);
+      this.currentAlias = parsed.length ? TimePeriod.Custom : null;
+      this.dateControl.setValue(parsed.length ? parsed : null, { emitEvent: false });
       this.inputValue = this.formatDateRange(parsed);
     }
   }
@@ -67360,7 +67364,6 @@ var DmRangeDatePickerLibComponent = class _DmRangeDatePickerLibComponent {
     this.onTouchedFn = fn;
   }
   dateSelection() {
-    this.manualDateChange = true;
     const range = this.dateControl.value;
     if (!this.showTimePicker && range && Array.isArray(range) && range.length === 2 && range[1] && (0, import_moment4.default)(range[1]).isValid()) {
       const endDate = new Date(range[1]);
@@ -67368,22 +67371,22 @@ var DmRangeDatePickerLibComponent = class _DmRangeDatePickerLibComponent {
       this.dateControl.setValue([range[0], endDate]);
     }
     this.inputValue = this.formatDateRange(this.dateControl.value);
+    this.currentAlias = TimePeriod.Custom;
   }
   onListSelect(key) {
-    this.currentAlias = key;
+    this.currentAlias = null;
     const alias = DATE_HINTS.find((item) => item.dateAlias === key);
     if (alias) {
+      this.currentAlias = key;
       const dates = [alias.interval.start, alias.interval.end];
       this.dateControl.setValue(dates);
-      this._initialValue = {
-        alias: key,
-        start: alias.interval.start,
-        end: alias.interval.end
-      };
     }
   }
+  isDateValid(date) {
+    return !!date && (0, import_moment4.default)(date).isValid();
+  }
   formatDate(date) {
-    if (!date || !(0, import_moment4.default)(date).isValid()) {
+    if (!this.isDateValid(date)) {
       return "";
     }
     return (0, import_moment4.default)(date).format("DD/MM/YYYY");
@@ -67442,7 +67445,6 @@ var DmRangeDatePickerLibComponent = class _DmRangeDatePickerLibComponent {
     this.dateControl.markAsTouched();
     this.dateControl.markAsDirty();
     this.inputValue = "";
-    this._initialValue = null;
     this.currentAlias = null;
     if (this.control) {
       this.control.reset();

package/main.js

@@ -64890,22 +64890,22 @@ var DmRangeDatePickerLibComponent = class _DmRangeDatePickerLibComponent {
     this.elementRef = elementRef;
     this.shadowDomStyleInjectorService = shadowDomStyleInjectorService;
     this.dateControl.valueChanges.subscribe((dates) => {
-      if (!dates || !dates[0] || !dates[1] && this.requireEndDate) {
-        return;
-      }
-      if (this.manualDateChange) {
-        this.currentAlias = TimePeriod.Custom;
-        this.manualDateChange = false;
-      }
+      const start = Array.isArray(dates) && this.isDateValid(dates[0]);
+      const end = Array.isArray(dates) && this.isDateValid(dates[1]);
+      const parsed = [];
+      if (start)
+        parsed.push(dates[0]);
+      if (start && end)
+        parsed.push(dates[1]);
       const rangeValue = {
         alias: this.currentAlias ?? "custom",
         start: dates?.[0] ?? null,
         end: dates?.[1] ?? null
       };
-      this.inputValue = this.formatDateRange(dates ?? []);
-      this.onChangeFn(rangeValue);
+      this.inputValue = this.formatDateRange(parsed);
+      this.onChangeFn(parsed.length ? rangeValue : null);
       this.elementRef.nativeElement.dispatchEvent(new CustomEvent("dm-range-date-picker-changed", {
-        detail: rangeValue,
+        detail: parsed.length ? rangeValue : null,
         bubbles: true,
         composed: true
       }));
@@ -64953,19 +64953,23 @@ var DmRangeDatePickerLibComponent = class _DmRangeDatePickerLibComponent {
     return this.requireEndDate ? endDateRequired(control) : null;
   }
   writeValue(value) {
-    if (!value || typeof value !== "object" || !("alias" in value) || value.alias == "custom" && (!value.start || !value.end && this.requireEndDate)) {
+    if (!value || typeof value !== "object" || !("alias" in value) || !value.alias) {
       this.inputValue = "";
-      this._initialValue = null;
       this.dateControl.setValue(null, { emitEvent: false });
       return;
     }
-    this._initialValue = value;
     if (value.alias !== "custom") {
       this.onListSelect(value.alias);
     } else {
-      this.currentAlias = TimePeriod.Custom;
-      const parsed = [new Date(value.start), new Date(value.end)];
-      this.dateControl.setValue(parsed, { emitEvent: false });
+      const start = this.isDateValid(value.start);
+      const end = this.isDateValid(value.end);
+      const parsed = [];
+      if (start)
+        parsed.push(value.start);
+      if (start && end)
+        parsed.push(value.end);
+      this.currentAlias = parsed.length ? TimePeriod.Custom : null;
+      this.dateControl.setValue(parsed.length ? parsed : null, { emitEvent: false });
       this.inputValue = this.formatDateRange(parsed);
     }
   }
@@ -64976,7 +64980,6 @@ var DmRangeDatePickerLibComponent = class _DmRangeDatePickerLibComponent {
     this.onTouchedFn = fn;
   }
   dateSelection() {
-    this.manualDateChange = true;
     const range = this.dateControl.value;
     if (!this.showTimePicker && range && Array.isArray(range) && range.length === 2 && range[1] && (0, import_moment4.default)(range[1]).isValid()) {
       const endDate = new Date(range[1]);
@@ -64984,22 +64987,22 @@ var DmRangeDatePickerLibComponent = class _DmRangeDatePickerLibComponent {
       this.dateControl.setValue([range[0], endDate]);
     }
     this.inputValue = this.formatDateRange(this.dateControl.value);
+    this.currentAlias = TimePeriod.Custom;
   }
   onListSelect(key) {
-    this.currentAlias = key;
+    this.currentAlias = null;
     const alias = DATE_HINTS.find((item) => item.dateAlias === key);
     if (alias) {
+      this.currentAlias = key;
       const dates = [alias.interval.start, alias.interval.end];
       this.dateControl.setValue(dates);
-      this._initialValue = {
-        alias: key,
-        start: alias.interval.start,
-        end: alias.interval.end
-      };
     }
   }
+  isDateValid(date) {
+    return !!date && (0, import_moment4.default)(date).isValid();
+  }
   formatDate(date) {
-    if (!date || !(0, import_moment4.default)(date).isValid()) {
+    if (!this.isDateValid(date)) {
       return "";
     }
     return (0, import_moment4.default)(date).format("DD/MM/YYYY");
@@ -65058,7 +65061,6 @@ var DmRangeDatePickerLibComponent = class _DmRangeDatePickerLibComponent {
     this.dateControl.markAsTouched();
     this.dateControl.markAsDirty();
     this.inputValue = "";
-    this._initialValue = null;
     this.currentAlias = null;
     if (this.control) {
       this.control.reset();