@syncfusion/ej2-calendars 20.4.52 → 21.1.35

package/src/maskbase/masked-date-time.js

@@ -17,7 +17,7 @@ var MaskedDateTime = /** @class */ (function () {
             hour: 'hour',
             minute: 'minute',
             second: 'second',
-            dayOfTheWeek: 'day of the week',
+            dayOfTheWeek: 'day of the week'
         };
         this.hiddenMask = '';
         this.validCharacters = 'dMyhmHfasz';
@@ -80,23 +80,31 @@ var MaskedDateTime = /** @class */ (function () {
         this.parent.off('keyDownHandler', this.maskKeydownHandler);
         this.parent.off('clearHandler', this.clearHandler);
     };
-    MaskedDateTime.prototype.createMask = function (dateformat) {
+    MaskedDateTime.prototype.createMask = function (navigated) {
+        if (navigated === void 0) { navigated = false; }
         this.isDayPart = this.isMonthPart = this.isYearPart = this.isHourPart = this.isMinutePart = this.isSecondsPart = false;
         this.dateformat = this.getCulturedFormat();
-        if (this.parent.maskPlaceholder.day)
+        if (this.parent.maskPlaceholder.day) {
             this.defaultConstant['day'] = this.parent.maskPlaceholder.day;
-        if (this.parent.maskPlaceholder.month)
+        }
+        if (this.parent.maskPlaceholder.month) {
             this.defaultConstant['month'] = this.parent.maskPlaceholder.month;
-        if (this.parent.maskPlaceholder.year)
+        }
+        if (this.parent.maskPlaceholder.year) {
             this.defaultConstant['year'] = this.parent.maskPlaceholder.year;
-        if (this.parent.maskPlaceholder.hour)
+        }
+        if (this.parent.maskPlaceholder.hour) {
             this.defaultConstant['hour'] = this.parent.maskPlaceholder.hour;
-        if (this.parent.maskPlaceholder.minute)
+        }
+        if (this.parent.maskPlaceholder.minute) {
             this.defaultConstant['minute'] = this.parent.maskPlaceholder.minute;
-        if (this.parent.maskPlaceholder.second)
+        }
+        if (this.parent.maskPlaceholder.second) {
             this.defaultConstant['second'] = this.parent.maskPlaceholder.second;
-        if (this.parent.maskPlaceholder.dayOfTheWeek)
+        }
+        if (this.parent.maskPlaceholder.dayOfTheWeek) {
             this.defaultConstant['dayOfTheWeek'] = this.parent.maskPlaceholder.dayOfTheWeek.toString();
+        }
         this.getCUltureMaskFormat();
         var inputValue = this.dateformat.replace(this.formatRegex, this.formatCheck());
         this.isHiddenMask = true;
@@ -106,6 +114,7 @@ var MaskedDateTime = /** @class */ (function () {
         this.mask = this.previousValue = inputValue;
         this.parent.maskedDateValue = this.mask;
         if (this.parent.value) {
+            this.navigated = navigated;
             this.setDynamicValue();
         }
     };
@@ -113,7 +122,8 @@ var MaskedDateTime = /** @class */ (function () {
         this.l10n = new L10n(this.parent.moduleName, this.defaultConstant, this.parent.locale);
         this.objectString = Object.keys(this.defaultConstant);
         for (var i = 0; i < this.objectString.length; i++) {
-            this.defaultConstant[this.objectString[i].toString()] = this.l10n.getConstant(this.objectString[i].toString());
+            this.defaultConstant[this.objectString[i].toString()] =
+                this.l10n.getConstant(this.objectString[i].toString());
         }
     };
     MaskedDateTime.prototype.validCharacterCheck = function () {
@@ -133,8 +143,7 @@ var MaskedDateTime = /** @class */ (function () {
         this.maskDateValue = new Date(+this.parent.value);
         this.isDayPart = this.isMonthPart = this.isYearPart = this.isHourPart = this.isMinutePart = this.isSecondsPart = true;
         this.updateValue();
-        // this.parent.inputElement.selectionStart = start;
-        // this.validCharacterCheck();
+        this.validCharacterCheck();
     };
     MaskedDateTime.prototype.setSelection = function (validChar) {
         var start = -1;
@@ -158,12 +167,13 @@ var MaskedDateTime = /** @class */ (function () {
             this.isDeleteKey = true;
             return;
         }
-        if ((!args.e.altKey && !args.e.ctrlKey) && (args.e.key === ARROWLEFT || args.e.key === ARROWRIGHT || args.e.key === SHIFTTAB || args.e.key === TAB || args.e.action === SHIFTTAB ||
+        if ((!args.e.altKey && !args.e.ctrlKey) && (args.e.key === ARROWLEFT || args.e.key === ARROWRIGHT
+            || args.e.key === SHIFTTAB || args.e.key === TAB || args.e.action === SHIFTTAB ||
             args.e.key === END || args.e.key === HOME)) {
             var start = this.parent.inputElement.selectionStart;
             var end = this.parent.inputElement.selectionEnd;
             var length_1 = this.parent.inputElement.value.length;
-            if ((start == 0 && end == length_1) && (args.e.key === TAB || args.e.action === SHIFTTAB)) {
+            if ((start === 0 && end === length_1) && (args.e.key === TAB || args.e.action === SHIFTTAB)) {
                 var index = args.e.action === SHIFTTAB ? end : 0;
                 this.parent.inputElement.selectionStart = this.parent.inputElement.selectionEnd = index;
             }
@@ -208,7 +218,8 @@ var MaskedDateTime = /** @class */ (function () {
         var newVal = inputValue.substring(0, start);
         var newDateValue = new Date(+this.maskDateValue);
         var maxDate = new Date(newDateValue.getFullYear(), newDateValue.getMonth() + 1, 0).getDate();
-        if (previousVal.indexOf(newVal) === 0 && (newVal.length === 0 || this.previousHiddenMask[newVal.length - 1] !== this.previousHiddenMask[newVal.length])) {
+        if (previousVal.indexOf(newVal) === 0 && (newVal.length === 0 ||
+            this.previousHiddenMask[newVal.length - 1] !== this.previousHiddenMask[newVal.length])) {
             for (var i = newVal.length; i < previousVal.length; i++) {
                 if (this.previousHiddenMask[i] !== '' && this.validCharacters.indexOf(this.previousHiddenMask[i]) >= 0) {
                     this.isDeletion = this.handleDeletion(this.previousHiddenMask[i], false);
@@ -220,114 +231,123 @@ var MaskedDateTime = /** @class */ (function () {
         }
         switch (this.previousHiddenMask[start - 1]) {
             case 'd':
-                var date = (this.isDayPart && newDateValue.getDate().toString().length < 2 && !this.isPersist() ? newDateValue.getDate() * 10 : 0) + parseInt(newVal[start - 1], 10);
-                this.isDateZero = (newVal[start - 1] == '0');
-                this.parent.isFocused = this.parent.isFocused ? false : this.parent.isFocused;
-                this.navigated = this.navigated ? false : this.navigated;
-                if (isNaN(date)) {
-                    return;
-                }
-                for (var i = 0; date > maxDate; i++) {
-                    date = parseInt(date.toString().slice(1), 10);
-                }
-                if (date >= 1) {
-                    newDateValue.setDate(date);
-                    this.isNavigate = date.toString().length === 2;
-                    this.previousDate = new Date(newDateValue.getFullYear(), newDateValue.getMonth(), newDateValue.getDate());
-                    if (newDateValue.getMonth() !== this.maskDateValue.getMonth()) {
+                {
+                    var date = (this.isDayPart && newDateValue.getDate().toString().length < 2 &&
+                        !this.isPersist() ? newDateValue.getDate() * 10 : 0) + parseInt(newVal[start - 1], 10);
+                    this.isDateZero = (newVal[start - 1] === '0');
+                    this.parent.isFocused = this.parent.isFocused ? false : this.parent.isFocused;
+                    this.navigated = this.navigated ? false : this.navigated;
+                    if (isNaN(date)) {
                         return;
                     }
-                    this.isDayPart = true;
-                    this.dayTypeCount = this.dayTypeCount + 1;
-                }
-                else {
-                    this.isDayPart = false;
-                    this.dayTypeCount = this.isDateZero ? this.dayTypeCount + 1 : this.dayTypeCount;
+                    for (var i = 0; date > maxDate; i++) {
+                        date = parseInt(date.toString().slice(1), 10);
+                    }
+                    if (date >= 1) {
+                        newDateValue.setDate(date);
+                        this.isNavigate = date.toString().length === 2;
+                        this.previousDate = new Date(newDateValue.getFullYear(), newDateValue.getMonth(), newDateValue.getDate());
+                        if (newDateValue.getMonth() !== this.maskDateValue.getMonth()) {
+                            return;
+                        }
+                        this.isDayPart = true;
+                        this.dayTypeCount = this.dayTypeCount + 1;
+                    }
+                    else {
+                        this.isDayPart = false;
+                        this.dayTypeCount = this.isDateZero ? this.dayTypeCount + 1 : this.dayTypeCount;
+                    }
+                    break;
                 }
-                break;
             case 'M':
-                var month = void 0;
-                if (newDateValue.getMonth().toString().length < 2 && !this.isPersist()) {
-                    month = (this.isMonthPart ? (newDateValue.getMonth() + 1) * 10 : 0) + parseInt(newVal[start - 1], 10);
-                }
-                else {
-                    month = parseInt(newVal[start - 1], 10);
-                }
-                this.parent.isFocused = this.parent.isFocused ? false : this.parent.isFocused;
-                this.navigated = this.navigated ? false : this.navigated;
-                this.isMonthZero = (newVal[start - 1] == '0');
-                if (!isNaN(month)) {
-                    while (month > 12) {
-                        month = parseInt(month.toString().slice(1), 10);
-                    }
-                    if (month >= 1) {
-                        newDateValue.setMonth(month - 1);
-                        this.isNavigate = month.toString().length === 2;
-                        if (newDateValue.getMonth() !== month - 1) {
-                            newDateValue.setDate(1);
-                            newDateValue.setMonth(month - 1);
+                {
+                    var month = void 0;
+                    if (newDateValue.getMonth().toString().length < 2 && !this.isPersist()) {
+                        month = (this.isMonthPart ? (newDateValue.getMonth() + 1) * 10 : 0) + parseInt(newVal[start - 1], 10);
+                    }
+                    else {
+                        month = parseInt(newVal[start - 1], 10);
+                    }
+                    this.parent.isFocused = this.parent.isFocused ? false : this.parent.isFocused;
+                    this.navigated = this.navigated ? false : this.navigated;
+                    this.isMonthZero = (newVal[start - 1] === '0');
+                    if (!isNaN(month)) {
+                        while (month > 12) {
+                            month = parseInt(month.toString().slice(1), 10);
                         }
-                        if (this.isDayPart) {
-                            var previousMaxDate = new Date(this.previousDate.getFullYear(), this.previousDate.getMonth() + 1, 0).getDate();
-                            var currentMaxDate = new Date(newDateValue.getFullYear(), newDateValue.getMonth() + 1, 0).getDate();
-                            if (this.previousDate.getDate() == previousMaxDate && currentMaxDate <= previousMaxDate) {
-                                newDateValue.setDate(currentMaxDate);
+                        if (month >= 1) {
+                            newDateValue.setMonth(month - 1);
+                            this.isNavigate = month.toString().length === 2;
+                            if (newDateValue.getMonth() !== month - 1) {
+                                newDateValue.setDate(1);
+                                newDateValue.setMonth(month - 1);
+                            }
+                            if (this.isDayPart) {
+                                var previousMaxDate = new Date(this.previousDate.getFullYear(), this.previousDate.getMonth() + 1, 0).getDate();
+                                var currentMaxDate = new Date(newDateValue.getFullYear(), newDateValue.getMonth() + 1, 0).getDate();
+                                if (this.previousDate.getDate() === previousMaxDate && currentMaxDate <= previousMaxDate) {
+                                    newDateValue.setDate(currentMaxDate);
+                                }
                             }
+                            this.previousDate = new Date(newDateValue.getFullYear(), newDateValue.getMonth(), newDateValue.getDate());
+                            this.isMonthPart = true;
+                            this.monthTypeCount = this.monthTypeCount + 1;
+                        }
+                        else {
+                            newDateValue.setMonth(0);
+                            this.isMonthPart = false;
+                            this.monthTypeCount = this.isMonthZero ? this.monthTypeCount + 1 : this.monthTypeCount;
                         }
-                        this.previousDate = new Date(newDateValue.getFullYear(), newDateValue.getMonth(), newDateValue.getDate());
-                        this.isMonthPart = true;
-                        this.monthTypeCount = this.monthTypeCount + 1;
                     }
                     else {
-                        newDateValue.setMonth(0);
-                        this.isMonthPart = false;
-                        this.monthTypeCount = this.isMonthZero ? this.monthTypeCount + 1 : this.monthTypeCount;
-                    }
-                }
-                else { // let monthString: string[] = <string[]>(getValue('months[stand-alone].wide', getDefaultDateObject()));
-                    var monthString = (this.getCulturedValue('months[stand-alone].wide'));
-                    var monthValue = Object.keys(monthString);
-                    this.monthCharacter += newVal[start - 1].toLowerCase();
-                    while (this.monthCharacter.length > 0) {
-                        var i = 1;
-                        for (var _i = 0, monthValue_1 = monthValue; _i < monthValue_1.length; _i++) {
-                            var months = monthValue_1[_i];
-                            if (monthString[i].toLowerCase().indexOf(this.monthCharacter) === 0) {
-                                newDateValue.setMonth(i - 1);
-                                this.isMonthPart = true;
-                                this.maskDateValue = newDateValue;
-                                return;
+                        var monthString = (this.getCulturedValue('months[stand-alone].wide'));
+                        var monthValue = Object.keys(monthString);
+                        this.monthCharacter += newVal[start - 1].toLowerCase();
+                        while (this.monthCharacter.length > 0) {
+                            var i = 1;
+                            for (var _i = 0, monthValue_1 = monthValue; _i < monthValue_1.length; _i++) {
+                                var months = monthValue_1[_i];
+                                if (monthString[i].toLowerCase().indexOf(this.monthCharacter) === 0) {
+                                    newDateValue.setMonth(i - 1);
+                                    this.isMonthPart = true;
+                                    this.maskDateValue = newDateValue;
+                                    return;
+                                }
+                                i++;
                             }
-                            i++;
+                            this.monthCharacter = this.monthCharacter.substring(1, this.monthCharacter.length);
                         }
-                        this.monthCharacter = this.monthCharacter.substring(1, this.monthCharacter.length);
                     }
+                    break;
                 }
-                break;
             case 'y':
-                var year = (this.isYearPart && (newDateValue.getFullYear().toString().length < 4 && !this.isShortYear) ? newDateValue.getFullYear() * 10 : 0) + parseInt(newVal[start - 1], 10);
-                this.isShortYear = false;
-                this.isYearZero = (newVal[start - 1] == '0');
-                if (isNaN(year)) {
-                    return;
-                }
-                while (year > 9999) {
-                    year = parseInt(year.toString().slice(1), 10);
-                }
-                if (year < 1) {
-                    this.isYearPart = false;
-                }
-                else {
-                    newDateValue.setFullYear(year);
-                    if (year.toString().length === 4) {
-                        this.isNavigate = true;
+                {
+                    var year = (this.isYearPart && (newDateValue.getFullYear().toString().length < 4
+                        && !this.isShortYear) ? newDateValue.getFullYear() * 10 : 0) + parseInt(newVal[start - 1], 10);
+                    this.isShortYear = false;
+                    this.isYearZero = (newVal[start - 1] === '0');
+                    if (isNaN(year)) {
+                        return;
                     }
-                    this.previousDate = new Date(newDateValue.getFullYear(), newDateValue.getMonth(), newDateValue.getDate());
-                    this.isYearPart = true;
+                    while (year > 9999) {
+                        year = parseInt(year.toString().slice(1), 10);
+                    }
+                    if (year < 1) {
+                        this.isYearPart = false;
+                    }
+                    else {
+                        newDateValue.setFullYear(year);
+                        if (year.toString().length === 4) {
+                            this.isNavigate = true;
+                        }
+                        this.previousDate = new Date(newDateValue.getFullYear(), newDateValue.getMonth(), newDateValue.getDate());
+                        this.isYearPart = true;
+                    }
+                    break;
                 }
-                break;
             case 'h':
-                this.hour = (this.isHourPart && (newDateValue.getHours() % 12 || 12).toString().length < 2 && !this.isPersist() ? (newDateValue.getHours() % 12 || 12) * 10 : 0) + parseInt(newVal[start - 1], 10);
+                this.hour = (this.isHourPart && (newDateValue.getHours() % 12 || 12).toString().length < 2
+                    && !this.isPersist() ? (newDateValue.getHours() % 12 || 12) * 10 : 0) + parseInt(newVal[start - 1], 10);
                 this.parent.isFocused = this.parent.isFocused ? false : this.parent.isFocused;
                 this.navigated = this.navigated ? false : this.navigated;
                 if (isNaN(this.hour)) {
@@ -342,7 +362,8 @@ var MaskedDateTime = /** @class */ (function () {
                 this.hourTypeCount = this.hourTypeCount + 1;
                 break;
             case 'H':
-                this.hour = (this.isHourPart && newDateValue.getHours().toString().length < 2 && !this.isPersist() ? newDateValue.getHours() * 10 : 0) + parseInt(newVal[start - 1], 10);
+                this.hour = (this.isHourPart && newDateValue.getHours().toString().length < 2 &&
+                    !this.isPersist() ? newDateValue.getHours() * 10 : 0) + parseInt(newVal[start - 1], 10);
                 this.parent.isFocused = this.parent.isFocused ? false : this.parent.isFocused;
                 this.navigated = this.navigated ? false : this.navigated;
                 if (isNaN(this.hour)) {
@@ -357,68 +378,81 @@ var MaskedDateTime = /** @class */ (function () {
                 this.hourTypeCount = this.hourTypeCount + 1;
                 break;
             case 'm':
-                var minutes = (this.isMinutePart && newDateValue.getMinutes().toString().length < 2 && !this.isPersist() ? newDateValue.getMinutes() * 10 : 0) + parseInt(newVal[start - 1], 10);
-                this.parent.isFocused = this.parent.isFocused ? false : this.parent.isFocused;
-                this.navigated = this.navigated ? false : this.navigated;
-                if (isNaN(minutes)) {
-                    return;
-                }
-                for (var i = 0; minutes > 59; i++) {
-                    minutes = parseInt(minutes.toString().slice(1), 10);
+                {
+                    var minutes = (this.isMinutePart && newDateValue.getMinutes().toString().length < 2
+                        && !this.isPersist() ? newDateValue.getMinutes() * 10 : 0) + parseInt(newVal[start - 1], 10);
+                    this.parent.isFocused = this.parent.isFocused ? false : this.parent.isFocused;
+                    this.navigated = this.navigated ? false : this.navigated;
+                    if (isNaN(minutes)) {
+                        return;
+                    }
+                    for (var i = 0; minutes > 59; i++) {
+                        minutes = parseInt(minutes.toString().slice(1), 10);
+                    }
+                    newDateValue.setMinutes(minutes);
+                    this.isNavigate = minutes.toString().length === 2;
+                    this.isMinutePart = true;
+                    this.minuteTypeCount = this.minuteTypeCount + 1;
+                    break;
                 }
-                newDateValue.setMinutes(minutes);
-                this.isNavigate = minutes.toString().length === 2;
-                this.isMinutePart = true;
-                this.minuteTypeCount = this.minuteTypeCount + 1;
-                break;
             case 's':
-                var seconds = (this.isSecondsPart && newDateValue.getSeconds().toString().length < 2 && !this.isPersist() ? newDateValue.getSeconds() * 10 : 0) + parseInt(newVal[start - 1], 10);
-                this.parent.isFocused = this.parent.isFocused ? false : this.parent.isFocused;
-                this.navigated = this.navigated ? false : this.navigated;
-                if (isNaN(seconds)) {
-                    return;
-                }
-                for (var i = 0; seconds > 59; i++) {
-                    seconds = parseInt(seconds.toString().slice(1), 10);
+                {
+                    var seconds = (this.isSecondsPart && newDateValue.getSeconds().toString().length < 2 &&
+                        !this.isPersist() ? newDateValue.getSeconds() * 10 : 0) + parseInt(newVal[start - 1], 10);
+                    this.parent.isFocused = this.parent.isFocused ? false : this.parent.isFocused;
+                    this.navigated = this.navigated ? false : this.navigated;
+                    if (isNaN(seconds)) {
+                        return;
+                    }
+                    for (var i = 0; seconds > 59; i++) {
+                        seconds = parseInt(seconds.toString().slice(1), 10);
+                    }
+                    newDateValue.setSeconds(seconds);
+                    this.isNavigate = seconds.toString().length === 2;
+                    this.isSecondsPart = true;
+                    this.secondTypeCount = this.secondTypeCount + 1;
+                    break;
                 }
-                newDateValue.setSeconds(seconds);
-                this.isNavigate = seconds.toString().length === 2;
-                this.isSecondsPart = true;
-                this.secondTypeCount = this.secondTypeCount + 1;
-                break;
             case 'a':
-                this.periodCharacter += newVal[start - 1].toLowerCase();
-                // let periodString: string[] = <string[]>(getValue('dayPeriods.format.wide', getDefaultDateObject()));;
-                var periodString = (this.getCulturedValue('dayPeriods.format.wide'));
-                var periodkeys = Object.keys(periodString);
-                //periodString[periodkeys[0]] : periodString[periodkeys[1]] : periodString[periodkeys[0]];
-                for (var i = 0; this.periodCharacter.length > 0; i++) {
-                    if ((periodString[periodkeys[0]].toLowerCase().indexOf(this.periodCharacter) === 0 && newDateValue.getHours() >= 12) || (periodString[periodkeys[1]].toLowerCase().indexOf(this.periodCharacter) === 0 && newDateValue.getHours() < 12)) {
-                        newDateValue.setHours((newDateValue.getHours() + 12) % 24);
-                        this.maskDateValue = newDateValue;
-                    }
-                    this.periodCharacter = this.periodCharacter.substring(1, this.periodCharacter.length);
-                    // Object.values()
+                {
+                    this.periodCharacter += newVal[start - 1].toLowerCase();
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    var periodString = (this.getCulturedValue('dayPeriods.format.wide'));
+                    var periodkeys = Object.keys(periodString);
+                    for (var i = 0; this.periodCharacter.length > 0; i++) {
+                        if ((periodString[periodkeys[0]].toLowerCase().indexOf(this.periodCharacter) === 0
+                            && newDateValue.getHours() >= 12) || (periodString[periodkeys[1]].toLowerCase().
+                            indexOf(this.periodCharacter) === 0 && newDateValue.getHours() < 12)) {
+                            newDateValue.setHours((newDateValue.getHours() + 12) % 24);
+                            this.maskDateValue = newDateValue;
+                        }
+                        this.periodCharacter = this.periodCharacter.substring(1, this.periodCharacter.length);
+                    }
+                    break;
                 }
-                break;
             default:
                 break;
         }
         this.maskDateValue = newDateValue;
     };
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     MaskedDateTime.prototype.formatCheck = function () {
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
         var proxy = this;
         function formatValueSpecifier(formattext) {
-            var isSymbol;
             var result;
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             var daysAbbreviated = proxy.getCulturedValue('days[stand-alone].abbreviated');
             var dayKeyAbbreviated = Object.keys(daysAbbreviated);
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             var daysWide = (proxy.getCulturedValue('days[stand-alone].wide'));
             var dayKeyWide = Object.keys(daysWide);
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             var daysNarrow = (proxy.getCulturedValue('days[stand-alone].narrow'));
             var dayKeyNarrow = Object.keys(daysNarrow);
             var monthAbbreviated = (proxy.getCulturedValue('months[stand-alone].abbreviated'));
             var monthWide = (proxy.getCulturedValue('months[stand-alone].wide'));
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             var periodString = (proxy.getCulturedValue('dayPeriods.format.wide'));
             var periodkeys = Object.keys(periodString);
             var milliseconds;
@@ -429,7 +463,7 @@ var MaskedDateTime = /** @class */ (function () {
                 case 'd':
                     result = proxy.isDayPart ? proxy.maskDateValue.getDate().toString() : proxy.defaultConstant['day'].toString();
                     result = proxy.zeroCheck(proxy.isDateZero, proxy.isDayPart, result);
-                    if (proxy.dayTypeCount == 2) {
+                    if (proxy.dayTypeCount === 2) {
                         proxy.isNavigate = true;
                         proxy.dayTypeCount = 0;
                     }
@@ -437,7 +471,7 @@ var MaskedDateTime = /** @class */ (function () {
                 case 'dd':
                     result = proxy.isDayPart ? proxy.roundOff(proxy.maskDateValue.getDate(), 2) : proxy.defaultConstant['day'].toString();
                     result = proxy.zeroCheck(proxy.isDateZero, proxy.isDayPart, result);
-                    if (proxy.dayTypeCount == 2) {
+                    if (proxy.dayTypeCount === 2) {
                         proxy.isNavigate = true;
                         proxy.dayTypeCount = 0;
                     }
@@ -456,7 +490,7 @@ var MaskedDateTime = /** @class */ (function () {
                 case 'M':
                     result = proxy.isMonthPart ? (proxy.maskDateValue.getMonth() + 1).toString() : proxy.defaultConstant['month'].toString();
                     result = proxy.zeroCheck(proxy.isMonthZero, proxy.isMonthPart, result);
-                    if (proxy.monthTypeCount == 2) {
+                    if (proxy.monthTypeCount === 2) {
                         proxy.isNavigate = true;
                         proxy.monthTypeCount = 0;
                     }
@@ -464,7 +498,7 @@ var MaskedDateTime = /** @class */ (function () {
                 case 'MM':
                     result = proxy.isMonthPart ? proxy.roundOff(proxy.maskDateValue.getMonth() + 1, 2) : proxy.defaultConstant['month'].toString();
                     result = proxy.zeroCheck(proxy.isMonthZero, proxy.isMonthPart, result);
-                    if (proxy.monthTypeCount == 2) {
+                    if (proxy.monthTypeCount === 2) {
                         proxy.isNavigate = true;
                         proxy.monthTypeCount = 0;
                     }
@@ -489,56 +523,56 @@ var MaskedDateTime = /** @class */ (function () {
                     break;
                 case 'h':
                     result = proxy.isHourPart ? (proxy.maskDateValue.getHours() % 12 || 12).toString() : proxy.defaultConstant['hour'].toString();
-                    if (proxy.hourTypeCount == 2) {
+                    if (proxy.hourTypeCount === 2) {
                         proxy.isNavigate = true;
                         proxy.hourTypeCount = 0;
                     }
                     break;
                 case 'hh':
                     result = proxy.isHourPart ? proxy.roundOff(proxy.maskDateValue.getHours() % 12 || 12, 2) : proxy.defaultConstant['hour'].toString();
-                    if (proxy.hourTypeCount == 2) {
+                    if (proxy.hourTypeCount === 2) {
                         proxy.isNavigate = true;
                         proxy.hourTypeCount = 0;
                     }
                     break;
                 case 'H':
                     result = proxy.isHourPart ? proxy.maskDateValue.getHours().toString() : proxy.defaultConstant['hour'].toString();
-                    if (proxy.hourTypeCount == 2) {
+                    if (proxy.hourTypeCount === 2) {
                         proxy.isNavigate = true;
                         proxy.hourTypeCount = 0;
                     }
                     break;
                 case 'HH':
                     result = proxy.isHourPart ? proxy.roundOff(proxy.maskDateValue.getHours(), 2) : proxy.defaultConstant['hour'].toString();
-                    if (proxy.hourTypeCount == 2) {
+                    if (proxy.hourTypeCount === 2) {
                         proxy.isNavigate = true;
                         proxy.hourTypeCount = 0;
                     }
                     break;
                 case 'm':
                     result = proxy.isMinutePart ? proxy.maskDateValue.getMinutes().toString() : proxy.defaultConstant['minute'].toString();
-                    if (proxy.minuteTypeCount == 2) {
+                    if (proxy.minuteTypeCount === 2) {
                         proxy.isNavigate = true;
                         proxy.minuteTypeCount = 0;
                     }
                     break;
                 case 'mm':
                     result = proxy.isMinutePart ? proxy.roundOff(proxy.maskDateValue.getMinutes(), 2) : proxy.defaultConstant['minute'].toString();
-                    if (proxy.minuteTypeCount == 2) {
+                    if (proxy.minuteTypeCount === 2) {
                         proxy.isNavigate = true;
                         proxy.minuteTypeCount = 0;
                     }
                     break;
                 case 's':
                     result = proxy.isSecondsPart ? proxy.maskDateValue.getSeconds().toString() : proxy.defaultConstant['second'].toString();
-                    if (proxy.secondTypeCount == 2) {
+                    if (proxy.secondTypeCount === 2) {
                         proxy.isNavigate = true;
                         proxy.secondTypeCount = 0;
                     }
                     break;
                 case 'ss':
                     result = proxy.isSecondsPart ? proxy.roundOff(proxy.maskDateValue.getSeconds(), 2) : proxy.defaultConstant['second'].toString();
-                    if (proxy.secondTypeCount == 2) {
+                    if (proxy.secondTypeCount === 2) {
                         proxy.isNavigate = true;
                         proxy.secondTypeCount = 0;
                     }
@@ -587,14 +621,12 @@ var MaskedDateTime = /** @class */ (function () {
     };
     MaskedDateTime.prototype.maskInputHandler = function () {
         var start = this.parent.inputElement.selectionStart;
-        var selectionChar = this.previousHiddenMask[start - 1];
         var formatText = '';
         if (this.validCharacters.indexOf(this.hiddenMask[start]) !== -1) {
             formatText = this.hiddenMask[start];
         }
-        var inputValue;
         this.differenceCheck();
-        inputValue = this.dateformat.replace(this.formatRegex, this.formatCheck());
+        var inputValue = this.dateformat.replace(this.formatRegex, this.formatCheck());
         this.isHiddenMask = true;
         this.hiddenMask = this.dateformat.replace(this.formatRegex, this.formatCheck());
         this.isDateZero = this.isMonthZero = this.isYearZero = false;
@@ -620,8 +652,6 @@ var MaskedDateTime = /** @class */ (function () {
             this.isDeletion = false;
         }
         this.isDeleteKey = false;
-        // this.setSelection(selectionChar);
-        // this.navigateSelection(inputValue);
     };
     MaskedDateTime.prototype.navigateSelection = function (isbackward) {
         var start = this.parent.inputElement.selectionStart;
@@ -702,24 +732,26 @@ var MaskedDateTime = /** @class */ (function () {
                 newDateValue.setDate(newDateValue.getDate() + incrementValue);
                 break;
             case 'M':
-                var newMonth = newDateValue.getMonth() + incrementValue;
-                newDateValue.setDate(1);
-                newDateValue.setMonth(newMonth);
-                if (this.isDayPart) {
-                    var previousMaxDate = new Date(this.previousDate.getFullYear(), this.previousDate.getMonth() + 1, 0).getDate();
-                    var currentMaxDate = new Date(newDateValue.getFullYear(), newDateValue.getMonth() + 1, 0).getDate();
-                    if (this.previousDate.getDate() == previousMaxDate && currentMaxDate <= previousMaxDate) {
-                        newDateValue.setDate(currentMaxDate);
+                {
+                    var newMonth = newDateValue.getMonth() + incrementValue;
+                    newDateValue.setDate(1);
+                    newDateValue.setMonth(newMonth);
+                    if (this.isDayPart) {
+                        var previousMaxDate = new Date(this.previousDate.getFullYear(), this.previousDate.getMonth() + 1, 0).getDate();
+                        var currentMaxDate = new Date(newDateValue.getFullYear(), newDateValue.getMonth() + 1, 0).getDate();
+                        if (this.previousDate.getDate() === previousMaxDate && currentMaxDate <= previousMaxDate) {
+                            newDateValue.setDate(currentMaxDate);
+                        }
+                        else {
+                            newDateValue.setDate(this.previousDate.getDate());
+                        }
                     }
                     else {
                         newDateValue.setDate(this.previousDate.getDate());
                     }
+                    this.previousDate = new Date(newDateValue.getFullYear(), newDateValue.getMonth(), newDateValue.getDate());
+                    break;
                 }
-                else {
-                    newDateValue.setDate(this.previousDate.getDate());
-                }
-                this.previousDate = new Date(newDateValue.getFullYear(), newDateValue.getMonth(), newDateValue.getDate());
-                break;
             case 'y':
                 newDateValue.setFullYear(newDateValue.getFullYear() + incrementValue);
                 break;
@@ -757,19 +789,19 @@ var MaskedDateTime = /** @class */ (function () {
     };
     MaskedDateTime.prototype.getCulturedFormat = function () {
         var formatString = (this.getCulturedValue('dateTimeFormats[availableFormats].yMd')).toString();
-        if (this.parent.moduleName == 'datepicker') {
+        if (this.parent.moduleName === 'datepicker') {
             formatString = (this.getCulturedValue('dateTimeFormats[availableFormats].yMd')).toString();
             if (this.parent.format && this.parent.formatString) {
                 formatString = this.parent.formatString;
             }
         }
-        if (this.parent.moduleName == 'datetimepicker') {
+        if (this.parent.moduleName === 'datetimepicker') {
             formatString = (this.getCulturedValue('dateTimeFormats[availableFormats].yMd')).toString();
             if (this.parent.dateTimeFormat) {
                 formatString = this.parent.dateTimeFormat;
             }
         }
-        if (this.parent.moduleName == 'timepicker') {
+        if (this.parent.moduleName === 'timepicker') {
             formatString = this.parent.cldrTimeFormat();
         }
         return formatString;
@@ -787,7 +819,6 @@ var MaskedDateTime = /** @class */ (function () {
         this.previousHiddenMask = this.hiddenMask;
         this.previousValue = inputValue;
         this.parent.updateInputValue(inputValue);
-        //this.parent.inputElement.value = inputValue;
     };
     MaskedDateTime.prototype.destroy = function () {
         this.removeEventListener();