@syncfusion/ej2-calendars 28.1.37 → 28.1.39

package/dist/es6/ej2-calendars.es2015.js

@@ -6294,10 +6294,8 @@ let DateRangePicker = class DateRangePicker extends CalendarBase {
                 if (range.length > 1) {
                     this.invalidValueString = null;
                     const dateOptions = { format: this.formatString, type: 'date', skeleton: 'yMd' };
-                    const start = this.globalize.parseDate(this.getAmPmValue(range[0]), dateOptions);
-                    const end = this.globalize.parseDate(this.getAmPmValue(range[1]), dateOptions);
-                    const startDate = this.getStartEndDate(start, false, range, dateOptions);
-                    const endDate = this.getStartEndDate(end, true, range, dateOptions);
+                    const startDate = this.globalize.parseDate(this.getAmPmValue(range[0]).trim(), dateOptions);
+                    const endDate = this.globalize.parseDate(this.getAmPmValue(range[1]).trim(), dateOptions);
                     if (!isNullOrUndefined(startDate) && !isNaN(+startDate) && !isNullOrUndefined(endDate) && !isNaN(+endDate)) {
                         const prevStartVal = this.startValue;
                         this.startValue = startDate;
@@ -6369,14 +6367,11 @@ let DateRangePicker = class DateRangePicker extends CalendarBase {
         }
         this.updateHiddenInput();
     }
-    getStartEndDate(date, isEnd, range, dateOptions) {
-        if (this.depth === 'Month') {
-            return this.globalize.parseDate(this.getAmPmValue(range[isEnd ? 1 : 0]).trim(), dateOptions);
-        }
-        else if (this.depth === 'Year' && !isNullOrUndefined(date)) {
+    getStartEndDate(date, isEnd) {
+        if (this.currentView() === 'Year' && !isNullOrUndefined(date)) {
             return new Date(date.getFullYear(), date.getMonth() + (isEnd ? 1 : 0), isEnd ? 0 : 1);
         }
-        else if (!isNullOrUndefined(date)) {
+        else if (this.currentView() === 'Decade' && !isNullOrUndefined(date)) {
             return new Date(date.getFullYear(), isEnd ? 11 : 0, isEnd ? 31 : 1);
         }
         else {
@@ -6865,7 +6860,7 @@ let DateRangePicker = class DateRangePicker extends CalendarBase {
                     const isDisabledCell = (!ele.classList.contains(DISABLED$2) || ele.classList.contains(DATEDISABLED));
                     if (!ele.classList.contains(WEEKNUMBER$2) && isDisabledCell) {
                         const eleDate = this.getIdValue(null, ele);
-                        const startDateValue = new Date(+this.startValue);
+                        const startDateValue = this.currentView() === 'Month' ? new Date(+this.startValue) : this.getStartEndDate(new Date(+this.startValue), false);
                         const eleDateValue = new Date(+eleDate);
                         if (eleDateValue.setHours(0, 0, 0, 0) >= startDateValue.setHours(0, 0, 0, 0) && +eleDate <= +currentDate) {
                             addClass([ele], RANGEHOVER);
@@ -6907,9 +6902,11 @@ let DateRangePicker = class DateRangePicker extends CalendarBase {
                         const eleDate = this.getIdValue(null, ele);
                         const eleDateValue = this.getIdValue(null, ele);
                         if (!isNullOrUndefined(this.endValue)) {
+                            const eleStartDateValue = this.currentView() === 'Month' ? new Date(+this.startValue) : this.getStartEndDate(new Date(+this.startValue), false);
+                            const eleEndDateValue = this.currentView() === 'Month' ? new Date(+this.endValue) : this.getStartEndDate(new Date(+this.endValue), true);
                             if (this.currentView() === this.depth &&
-                                +eleDateValue.setHours(0, 0, 0, 0) >= +new Date(+this.startValue).setHours(0, 0, 0, 0)
-                                && +eleDateValue.setHours(0, 0, 0, 0) <= +new Date(+this.endValue).setHours(0, 0, 0, 0) &&
+                                +eleDateValue.setHours(0, 0, 0, 0) >= +eleStartDateValue.setHours(0, 0, 0, 0)
+                                && +eleDateValue.setHours(0, 0, 0, 0) <= +eleEndDateValue.setHours(0, 0, 0, 0) &&
                                 !this.isSameStartEnd(new Date(+this.startValue), new Date(+this.endValue)) &&
                                 +new Date(+this.startValue).setHours(0, 0, 0, 0) >= +this.min
                                 && +new Date(+this.endValue).setHours(0, 0, 0, 0) <= +this.max
@@ -6929,7 +6926,7 @@ let DateRangePicker = class DateRangePicker extends CalendarBase {
                             removeClass([ele], [RANGEHOVER]);
                         }
                         if (!ele.classList.contains(OTHERMONTH$2)) {
-                            const startDateValue = new Date(+this.startValue);
+                            const startDateValue = this.currentView() === 'Month' ? new Date(+this.startValue) : this.getStartEndDate(new Date(+this.startValue), false);
                             let eleDateValue = new Date(+eleDate);
                             if (this.currentView() === this.depth &&
                                 +eleDateValue.setHours(0, 0, 0, 0) === +startDateValue.setHours(0, 0, 0, 0)
@@ -6940,7 +6937,7 @@ let DateRangePicker = class DateRangePicker extends CalendarBase {
                                 addClass([ele], [STARTDATE, SELECTED$3]);
                                 this.addSelectedAttributes(ele, this.startValue, true);
                             }
-                            const endDateValue = new Date(+this.endValue);
+                            const endDateValue = this.currentView() === 'Month' ? new Date(+this.endValue) : this.getStartEndDate(new Date(+this.endValue), true);
                             if (this.currentView() === 'Year') {
                                 eleDateValue = new Date(eleDateValue.getFullYear(), eleDateValue.getMonth() + 1, 0);
                             }
@@ -7033,14 +7030,36 @@ let DateRangePicker = class DateRangePicker extends CalendarBase {
         if (event) {
             event.preventDefault();
         }
-        const date = isNullOrUndefined(event) ? this.getIdValue(null, element)
+        let isValue;
+        let startDateValue;
+        let endDateValue;
+        const value = this.inputElement.value;
+        if (!isNullOrUndefined(value) && value.trim() !== '') {
+            const range = value.split(' ' + this.separator + ' ');
+            if (range.length > 1 && ((this.currentView() === 'Year' && this.depth === 'Year')
+                || (this.currentView() === 'Decade' && this.depth === 'Decade'))) {
+                const dateOptions = { format: this.formatString, type: 'date', skeleton: 'yMd' };
+                startDateValue = this.globalize.parseDate(this.getAmPmValue(range[0]).trim(), dateOptions);
+                endDateValue = this.globalize.parseDate(this.getAmPmValue(range[1]).trim(), dateOptions);
+                isValue = true;
+            }
+        }
+        let date = isNullOrUndefined(event) ? this.getIdValue(null, element)
             : this.getIdValue(event, null);
+        if (!isNullOrUndefined(this.startValue)) {
+            if (this.currentView() === 'Year' && this.depth === 'Year') {
+                date = new Date(date.getFullYear(), date.getMonth(), this.startValue.getDate());
+            }
+            else if (this.currentView() === 'Decade' && this.depth === 'Decade') {
+                date = new Date(date.getFullYear(), this.startValue.getMonth(), this.startValue.getDate());
+            }
+        }
         const y = date.getFullYear();
         const m = date.getMonth();
-        const firstDay = new Date(y, m, 1);
-        const lastDay = new Date(y, m + 1, 0);
-        const firstMonth = new Date(y, 0, 1);
-        const lastMonth = new Date(y, 11, 31);
+        const firstDay = isValue ? new Date(y, m, startDateValue.getDate(), startDateValue.getHours(), startDateValue.getMinutes(), startDateValue.getSeconds()) : new Date(y, m, 1);
+        const lastDay = isValue ? new Date(y, m, endDateValue.getDate(), endDateValue.getHours(), endDateValue.getMinutes(), endDateValue.getSeconds()) : new Date(y, m + 1, 0);
+        const firstMonth = isValue ? new Date(y, startDateValue.getMonth(), startDateValue.getDate(), startDateValue.getHours(), startDateValue.getMinutes(), startDateValue.getSeconds()) : new Date(y, 0, 1);
+        const lastMonth = isValue ? new Date(y, endDateValue.getMonth(), endDateValue.getDate(), endDateValue.getHours(), endDateValue.getMinutes(), endDateValue.getSeconds()) : new Date(y, 11, 31);
         if (!isNullOrUndefined(this.endValue) && !isNullOrUndefined(this.startValue)) {
             if (!this.isMobile || this.isMobile && !this.endButton.element.classList.contains(ACTIVE$1)) {
                 this.removeSelection();