@syncfusion/ej2-calendars 20.1.56 → 20.2.36

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

@@ -33,6 +33,7 @@ var MaskedDateTime = /** @class */ (function () {
         this.isHiddenMask = false;
         this.isComplete = false;
         this.isNavigate = false;
+        this.navigated = false;
         this.formatRegex = /EEEEE|EEEE|EEE|EE|E|dddd|ddd|dd|d|MMMM|MMM|MM|M|yyyy|yy|y|HH|H|hh|h|mm|m|fff|ff|f|aa|a|ss|s|zzzz|zzz|zz|z|'[^']*'|'[^']*'/g;
         this.isDeletion = false;
         this.isShortYear = false;
@@ -152,6 +153,7 @@ var MaskedDateTime = /** @class */ (function () {
         this.parent.inputElement.setSelectionRange(start, end);
     };
     MaskedDateTime.prototype.maskKeydownHandler = function (args) {
+        this.dayTypeCount = this.monthTypeCount = this.hourTypeCount = this.minuteTypeCount = this.secondTypeCount = 0;
         if (args.e.key === 'Delete') {
             this.isDeleteKey = true;
             return;
@@ -185,6 +187,10 @@ var MaskedDateTime = /** @class */ (function () {
             this.validCharacterCheck();
         }
     };
+    MaskedDateTime.prototype.isPersist = function () {
+        var isPersist = this.parent.isFocused || this.navigated;
+        return isPersist;
+    };
     MaskedDateTime.prototype.differenceCheck = function () {
         var start = this.parent.inputElement.selectionStart;
         var inputValue = this.parent.inputElement.value;
@@ -204,8 +210,10 @@ var MaskedDateTime = /** @class */ (function () {
         }
         switch (this.previousHiddenMask[start - 1]) {
             case 'd':
-                var date = (this.isDayPart && newDateValue.getDate().toString().length < 2 ? newDateValue.getDate() * 10 : 0) + parseInt(newVal[start - 1], 10);
+                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;
                 }
@@ -229,12 +237,14 @@ var MaskedDateTime = /** @class */ (function () {
                 break;
             case 'M':
                 var month = void 0;
-                if (newDateValue.getMonth().toString().length < 2) {
+                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) {
@@ -307,7 +317,9 @@ var MaskedDateTime = /** @class */ (function () {
                 }
                 break;
             case 'h':
-                this.hour = (this.isHourPart && (newDateValue.getHours() % 12 || 12).toString().length < 2 ? (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)) {
                     return;
                 }
@@ -320,7 +332,9 @@ var MaskedDateTime = /** @class */ (function () {
                 this.hourTypeCount = this.hourTypeCount + 1;
                 break;
             case 'H':
-                this.hour = (this.isHourPart && newDateValue.getHours().toString().length < 2 ? 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)) {
                     return;
                 }
@@ -333,7 +347,9 @@ var MaskedDateTime = /** @class */ (function () {
                 this.hourTypeCount = this.hourTypeCount + 1;
                 break;
             case 'm':
-                var minutes = (this.isMinutePart && newDateValue.getMinutes().toString().length < 2 ? newDateValue.getMinutes() * 10 : 0) + parseInt(newVal[start - 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;
                 }
@@ -346,7 +362,9 @@ var MaskedDateTime = /** @class */ (function () {
                 this.minuteTypeCount = this.minuteTypeCount + 1;
                 break;
             case 's':
-                var seconds = (this.isSecondsPart && newDateValue.getSeconds().toString().length < 2 ? newDateValue.getSeconds() * 10 : 0) + parseInt(newVal[start - 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;
                 }
@@ -401,6 +419,10 @@ 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) {
+                        proxy.isNavigate = true;
+                        proxy.dayTypeCount = 0;
+                    }
                     break;
                 case 'dd':
                     result = proxy.isDayPart ? proxy.roundOff(proxy.maskDateValue.getDate(), 2) : proxy.defaultConstant['day'].toString();
@@ -424,6 +446,10 @@ 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) {
+                        proxy.isNavigate = true;
+                        proxy.monthTypeCount = 0;
+                    }
                     break;
                 case 'MM':
                     result = proxy.isMonthPart ? proxy.roundOff(proxy.maskDateValue.getMonth() + 1, 2) : proxy.defaultConstant['month'].toString();
@@ -453,6 +479,10 @@ var MaskedDateTime = /** @class */ (function () {
                     break;
                 case 'h':
                     result = proxy.isHourPart ? (proxy.maskDateValue.getHours() % 12 || 12).toString() : proxy.defaultConstant['hour'].toString();
+                    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();
@@ -463,6 +493,10 @@ var MaskedDateTime = /** @class */ (function () {
                     break;
                 case 'H':
                     result = proxy.isHourPart ? proxy.maskDateValue.getHours().toString() : proxy.defaultConstant['hour'].toString();
+                    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();
@@ -473,6 +507,10 @@ var MaskedDateTime = /** @class */ (function () {
                     break;
                 case 'm':
                     result = proxy.isMinutePart ? proxy.maskDateValue.getMinutes().toString() : proxy.defaultConstant['minute'].toString();
+                    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();
@@ -483,6 +521,10 @@ var MaskedDateTime = /** @class */ (function () {
                     break;
                 case 's':
                     result = proxy.isSecondsPart ? proxy.maskDateValue.getSeconds().toString() : proxy.defaultConstant['second'].toString();
+                    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();
@@ -561,6 +603,7 @@ var MaskedDateTime = /** @class */ (function () {
         var start = this.parent.inputElement.selectionStart;
         var end = this.parent.inputElement.selectionEnd;
         var formatIndex = isbackward ? start - 1 : end + 1;
+        this.navigated = true;
         while (formatIndex < this.hiddenMask.length && formatIndex >= 0) {
             if (this.validCharacters.indexOf(this.hiddenMask[formatIndex]) >= 0) {
                 this.setSelection(this.hiddenMask[formatIndex]);