@syncfusion/ej2-calendars 26.2.12 → 27.1.50

package/src/datetimepicker/datetimepicker.js

@@ -142,7 +142,6 @@ var DateTimePicker = /** @class */ (function (_super) {
         if (this.showClearButton) {
             this.clearButton = document.getElementsByClassName('e-clear-icon')[0];
         }
-        this.hide(null);
         if (this.popupObject && this.popupObject.element.classList.contains(POPUP)) {
             this.popupObject.destroy();
             detach(this.dateTimeWrapper);
@@ -215,6 +214,12 @@ var DateTimePicker = /** @class */ (function (_super) {
         if (typeof (this.max) === 'string') {
             this.max = this.checkDateValue(new Date(this.max));
         }
+        if (typeof (this.minTime) === 'string') {
+            this.minTime = this.checkDateValue(new Date(this.minTime));
+        }
+        if (typeof (this.maxTime) === 'string') {
+            this.maxTime = this.checkDateValue(new Date(this.maxTime));
+        }
         if (!isNullOrUndefined(closest(this.element, 'fieldset')) && closest(this.element, 'fieldset').disabled) {
             this.enabled = false;
         }
@@ -286,7 +291,7 @@ var DateTimePicker = /** @class */ (function (_super) {
     DateTimePicker.prototype.checkValidState = function (value) {
         this.isValidState = true;
         if (!this.strictMode) {
-            if ((+(value) > +(this.max)) || (+(value) < +(this.min))) {
+            if ((+(value) > +(this.max)) || (+(value) < +(this.min)) || !this.isValidTime(value)) {
                 this.isValidState = false;
             }
         }
@@ -301,6 +306,54 @@ var DateTimePicker = /** @class */ (function (_super) {
         }
         attributes(this.inputElement, { 'aria-invalid': this.isValidState ? 'false' : 'true' });
     };
+    DateTimePicker.prototype.isValidTime = function (value) {
+        if (value != null && (this.minTime || this.maxTime)) {
+            var minTimeValue = void 0;
+            var maxTimeValue = void 0;
+            var maxValue = void 0;
+            var minValue = void 0;
+            var valueTime = value.getHours() * 3600000 + value.getMinutes() * 60000 +
+                value.getSeconds() * 1000 + value.getMilliseconds();
+            if (this.minTime) {
+                minTimeValue = this.minTime.getHours() * 3600000 + this.minTime.getMinutes() * 60000 +
+                    this.minTime.getSeconds() * 1000 + this.minTime.getMilliseconds();
+            }
+            if (this.maxTime) {
+                maxTimeValue = this.maxTime.getHours() * 3600000 + this.maxTime.getMinutes() * 60000 +
+                    this.maxTime.getSeconds() * 1000 + this.maxTime.getMilliseconds();
+            }
+            if (this.min && (+value.getDate() === +this.min.getDate() && +value.getMonth() === +this.min.getMonth() &&
+                +value.getFullYear() === +this.min.getFullYear())) {
+                minValue = this.min.getHours() * 3600000 + this.min.getMinutes() * 60000 +
+                    this.min.getSeconds() * 1000 + this.min.getMilliseconds();
+                minTimeValue = minTimeValue < minValue ? minValue : minTimeValue;
+            }
+            if (this.max && (+value.getDate() === +this.max.getDate() && +value.getMonth() === +this.max.getMonth() &&
+                +this.max.getFullYear() === +this.max.getFullYear())) {
+                maxValue = this.max.getHours() * 3600000 + this.max.getMinutes() * 60000 +
+                    this.max.getSeconds() * 1000 + this.max.getMilliseconds();
+                maxTimeValue = maxTimeValue > maxValue ? maxValue : maxTimeValue;
+            }
+            if (this.strictMode) {
+                var newValue = void 0;
+                if (minTimeValue && valueTime < minTimeValue) {
+                    newValue = new Date(value.getFullYear(), value.getMonth(), value.getDate(), this.minTime.getHours(), this.minTime.getMinutes(), this.minTime.getSeconds(), this.minTime.getMilliseconds());
+                    this.setProperties({ value: newValue }, true);
+                    this.changedArgs = { value: this.value };
+                }
+                else if (maxTimeValue && valueTime > maxTimeValue) {
+                    newValue = new Date(value.getFullYear(), value.getMonth(), value.getDate(), this.maxTime.getHours(), this.maxTime.getMinutes(), this.maxTime.getSeconds(), this.maxTime.getMilliseconds());
+                    this.setProperties({ value: newValue }, true);
+                    this.changedArgs = { value: this.value };
+                }
+                return true;
+            }
+            else {
+                return !((minTimeValue && valueTime < minTimeValue) || (maxTimeValue && valueTime > maxTimeValue));
+            }
+        }
+        return true;
+    };
     DateTimePicker.prototype.validateValue = function (value) {
         var dateVal = value;
         if (this.strictMode) {
@@ -519,12 +572,12 @@ var DateTimePicker = /** @class */ (function (_super) {
             if (this.dateFormatString === '') {
                 this.dateFormatString = this.cldrDateTimeFormat();
             }
-            dateObject = this.globalize.parseDate(this.inputElement.value, {
+            dateObject = this.globalize.parseDate(this.getAmPmValue(this.inputElement.value), {
                 format: this.dateFormatString, type: 'datetime'
             });
         }
         else {
-            dateObject = this.globalize.parseDate(this.inputElement.value, {
+            dateObject = this.globalize.parseDate(this.getAmPmValue(this.inputElement.value), {
                 format: this.cldrDateTimeFormat(), type: 'datetime', calendar: 'islamic'
             });
         }
@@ -997,20 +1050,35 @@ var DateTimePicker = /** @class */ (function (_super) {
         var tempStartValue;
         var start;
         var tempMin = this.min;
+        var tempMax = this.max;
         var value = date === null ? new Date() : date;
-        if ((+value.getDate() === +tempMin.getDate() && +value.getMonth() === +tempMin.getMonth() &&
-            +value.getFullYear() === +tempMin.getFullYear()) || ((+new Date(value.getFullYear(), value.getMonth(), value.getDate())) <=
-            +new Date(tempMin.getFullYear(), tempMin.getMonth(), tempMin.getDate()))) {
+        var isModified = false;
+        var startValue;
+        if (this.minTime) {
+            startValue = new Date(value.getFullYear(), value.getMonth(), value.getDate(), this.minTime.getHours(), this.minTime.getMinutes(), this.minTime.getSeconds(), this.minTime.getMilliseconds());
+            isModified = true;
+        }
+        else {
+            startValue = value;
+        }
+        if ((+startValue.getDate() === +tempMin.getDate() && +startValue.getMonth() === +tempMin.getMonth() &&
+            +startValue.getFullYear() === +tempMin.getFullYear()) ||
+            ((+new Date(startValue.getFullYear(), startValue.getMonth(), startValue.getDate())) <=
+                +new Date(tempMin.getFullYear(), tempMin.getMonth(), tempMin.getDate()))) {
             start = false;
-            tempStartValue = this.min;
+            tempStartValue = tempMin;
+            if (isModified && ((+new Date(startValue.getFullYear(), startValue.getMonth(), startValue.getDate(), startValue.getHours(), startValue.getMinutes(), startValue.getSeconds(), startValue.getMilliseconds())) >=
+                +new Date(tempMin.getFullYear(), tempMin.getMonth(), tempMin.getDate(), tempMin.getHours(), tempMin.getMinutes(), tempMin.getSeconds(), tempMin.getMilliseconds()))) {
+                tempStartValue.setHours(startValue.getHours(), startValue.getMinutes(), startValue.getSeconds(), startValue.getMilliseconds());
+            }
         }
-        else if (+value < +this.max && +value > +this.min) {
-            start = true;
-            tempStartValue = value;
+        else if (+startValue < +tempMax && +startValue > +tempMin) {
+            start = !isModified;
+            tempStartValue = startValue;
         }
-        else if (+value >= +this.max) {
+        else if (+startValue >= +tempMax) {
             start = true;
-            tempStartValue = this.max;
+            tempStartValue = tempMax;
         }
         return this.calculateStartEnd(tempStartValue, start, 'starttime');
     };
@@ -1059,17 +1127,31 @@ var DateTimePicker = /** @class */ (function (_super) {
         var end;
         var tempMax = this.max;
         var value = date === null ? new Date() : date;
-        if ((+value.getDate() === +tempMax.getDate() && +value.getMonth() === +tempMax.getMonth() &&
-            +value.getFullYear() === +tempMax.getFullYear()) || (+new Date(value.getUTCFullYear(), value.getMonth(), value.getDate()) >=
-            +new Date(tempMax.getFullYear(), tempMax.getMonth(), tempMax.getDate()))) {
+        var isModified = false;
+        var endValue;
+        if (this.maxTime) {
+            endValue = new Date(value.getFullYear(), value.getMonth(), value.getDate(), this.maxTime.getHours(), this.maxTime.getMinutes(), this.maxTime.getSeconds(), this.maxTime.getMilliseconds());
+            isModified = true;
+        }
+        else {
+            endValue = value;
+        }
+        if ((+endValue.getDate() === +tempMax.getDate() && +endValue.getMonth() === +tempMax.getMonth() &&
+            +endValue.getFullYear() === +tempMax.getFullYear()) ||
+            (+new Date(endValue.getUTCFullYear(), endValue.getMonth(), endValue.getDate()) >=
+                +new Date(tempMax.getFullYear(), tempMax.getMonth(), tempMax.getDate()))) {
             end = false;
             tempEndValue = this.max;
+            if (isModified && (+new Date(endValue.getUTCFullYear(), endValue.getMonth(), endValue.getDate(), endValue.getHours(), endValue.getMinutes(), endValue.getSeconds(), endValue.getMilliseconds()) <=
+                +new Date(tempMax.getFullYear(), tempMax.getMonth(), tempMax.getDate(), tempMax.getHours(), tempMax.getMinutes(), tempMax.getSeconds(), tempMax.getMilliseconds()))) {
+                tempEndValue.setHours(endValue.getHours(), endValue.getMinutes(), endValue.getSeconds(), endValue.getMilliseconds());
+            }
         }
-        else if (+value < +this.max && +value > +this.min) {
-            end = true;
-            tempEndValue = value;
+        else if (+endValue < +this.max && +endValue > +this.min) {
+            end = !isModified;
+            tempEndValue = endValue;
         }
-        else if (+value <= +this.min) {
+        else if (+endValue <= +this.min) {
             end = true;
             tempEndValue = this.min;
         }
@@ -1672,6 +1754,12 @@ var DateTimePicker = /** @class */ (function (_super) {
     __decorate([
         Property(new Date(2099, 11, 31))
     ], DateTimePicker.prototype, "max", void 0);
+    __decorate([
+        Property(null)
+    ], DateTimePicker.prototype, "minTime", void 0);
+    __decorate([
+        Property(null)
+    ], DateTimePicker.prototype, "maxTime", void 0);
     __decorate([
         Property(null)
     ], DateTimePicker.prototype, "firstDayOfWeek", void 0);

package/src/timepicker/timepicker.d.ts

@@ -514,6 +514,7 @@ export declare class TimePicker extends Component<HTMLElement> implements IInput
     private getCldrDateTimeFormat;
     private checkInvalidValue;
     requiredModules(): ModuleDeclaration[];
+    protected getAmPmValue(date: string | null | undefined): string;
     private cldrFormat;
     destroy(): void;
     protected ensureInputAttribute(): void;

package/src/timepicker/timepicker.js

@@ -403,18 +403,18 @@ var TimePicker = /** @class */ (function (_super) {
                 if (!(/^[a-zA-Z0-9- ]*$/).test(value)) {
                     valueExpression = this.setCurrentDate(this.getDateObject(value));
                     if (isNullOrUndefined(valueExpression)) {
-                        valueExpression = this.checkDateValue(this.globalize.parseDate(valueString, {
+                        valueExpression = this.checkDateValue(this.globalize.parseDate(this.getAmPmValue(valueString), {
                             format: this.getCldrDateTimeFormat(), type: 'datetime'
                         }));
                         if (isNullOrUndefined(valueExpression)) {
-                            valueExpression = this.checkDateValue(this.globalize.parseDate(valueString, {
+                            valueExpression = this.checkDateValue(this.globalize.parseDate(this.getAmPmValue(valueString), {
                                 format: this.formatString, type: 'dateTime', skeleton: 'yMd'
                             }));
                         }
                     }
                 }
             }
-            valueExp = this.globalize.parseDate(valueString, {
+            valueExp = this.globalize.parseDate(this.getAmPmValue(valueString), {
                 format: this.getCldrDateTimeFormat(), type: 'datetime'
             });
             valueExpression = (!isNullOrUndefined(valueExp) && valueExp instanceof Date && !isNaN(+valueExp)) ? valueExp : null;
@@ -453,6 +453,20 @@ var TimePicker = /** @class */ (function (_super) {
         }
         return modules;
     };
+    TimePicker.prototype.getAmPmValue = function (date) {
+        try {
+            if (typeof date === 'string' && date.trim() !== '') {
+                // Replace am/pm variants with uppercase AM/PM
+                return date.replace(/(am|pm|Am|aM|pM|Pm)/g, function (match) { return match.toLocaleUpperCase(); });
+            }
+            // If date is null, undefined, or an empty string, return a default value or empty string
+            return '';
+        }
+        catch (error) {
+            console.error('Error occurred while processing date:', error);
+            return ''; // Return a default value in case of an error
+        }
+    };
     TimePicker.prototype.cldrFormat = function (type) {
         var cldrDateTimeString;
         if (this.locale === 'en' || this.locale === 'en-US') {
@@ -1228,7 +1242,7 @@ var TimePicker = /** @class */ (function (_super) {
         return dateVal;
     };
     TimePicker.prototype.valueIsDisable = function (value) {
-        if (this.disableItemCollection.length > 0) {
+        if (!isNullOrUndefined(this.disableItemCollection) && this.disableItemCollection.length > 0) {
             if (this.disableItemCollection.length === this.timeCollections.length) {
                 return false;
             }
@@ -1960,10 +1974,10 @@ var TimePicker = /** @class */ (function (_super) {
     };
     TimePicker.prototype.timeParse = function (today, val) {
         var value;
-        value = this.globalize.parseDate(today + ' ' + val, {
+        value = this.globalize.parseDate(this.getAmPmValue(today + ' ' + val), {
             format: this.cldrDateFormat() + ' ' + this.cldrTimeFormat(), type: 'datetime'
         });
-        value = isNullOrUndefined(value) ? this.globalize.parseDate(today + ' ' + val, {
+        value = isNullOrUndefined(value) ? this.globalize.parseDate(this.getAmPmValue(today + ' ' + val), {
             format: this.cldrDateFormat() + ' ' + this.dateToNumeric(), type: 'datetime'
         }) : value;
         value = isNullOrUndefined(value) ? value : new Date(value.setMilliseconds(0));