i-tech-shared-components 1.4.55 → 1.4.56-alpha.1770835262212

package/fesm2022/i-tech-shared-components.mjs

@@ -1539,7 +1539,6 @@ class DateRangeDatepickerComponent {
         this.isOpen = false;
         this.isSelectingRange = false;
         this.LabelTypeEnum = LabelTypeEnum;
-        this.calendarClickCount = 0;
         this.dateRangeForm = new UntypedFormGroup({
             startDate: new UntypedFormControl('', [Validators.maxLength(10)]),
             endDate: new UntypedFormControl('', [Validators.maxLength(10)]),
@@ -1600,6 +1599,7 @@ class DateRangeDatepickerComponent {
             this.isSelectingRange = false;
             if (startDate === null && endDate === null) {
                 this.dateRangeForm.reset();
+                this.picker.select(null);
                 this.selectionChange.emit(value);
             }
             else if (startDate && endDate) {
@@ -1621,31 +1621,25 @@ class DateRangeDatepickerComponent {
         this.isOpen = true;
         if (this.presetActions?.length) {
             this.selectionSub?.unsubscribe();
-            this.calendarClickCount = 0;
-            // Wait for picker content to render, then subscribe to calendar user selections
-            setTimeout(() => {
-                const content = this.picker._componentRef?.instance;
-                const calendar = content?._calendar;
-                if (calendar) {
-                    this.selectionSub = calendar._userSelection.subscribe(() => {
-                        this.calendarClickCount++;
-                        // Only check after at least 2 clicks (start + end) to avoid
-                        // false positives from old model selection on the first click
-                        if (this.calendarClickCount >= 2) {
-                            setTimeout(() => {
-                                const selection = this.picker._model?.selection;
-                                if (selection?.start && selection?.end) {
-                                    this.calendarClickCount = 0;
-                                    const applyBtn = document.querySelector('.hidden-apply-btn');
-                                    if (applyBtn) {
-                                        applyBtn.click();
-                                    }
-                                }
-                            }, 50);
-                        }
-                    });
-                }
-            }, 200);
+            let rangeStarted = false;
+            const model = this.picker._model;
+            if (model) {
+                this.selectionSub = model.selectionChanged.subscribe((change) => {
+                    const selection = change?.selection;
+                    if (selection?.start && !selection?.end) {
+                        rangeStarted = true;
+                    }
+                    else if (selection?.start && selection?.end && rangeStarted) {
+                        rangeStarted = false;
+                        setTimeout(() => {
+                            const applyBtn = document.querySelector('.hidden-apply-btn');
+                            if (applyBtn) {
+                                applyBtn.click();
+                            }
+                        });
+                    }
+                });
+            }
         }
     }
     onPickerClosed() {