@progress/kendo-dateinputs-common 0.2.0-dev.202301131210 → 0.2.0-dev.202301171717

package/dist/npm/common/dateobject.js

@@ -547,6 +547,14 @@ var DateObject = /** @class */ (function () {
                 literal: ""
             };
         });
+        var flatDateParts = dateParts.partMap
+            .map(function (x) {
+            return {
+                type: x.type,
+                pattern: x.pattern,
+                text: ""
+            };
+        });
         for (var i = 0; i < datePartsLiterals.length; i++) {
             var datePart = datePartsLiterals[i];
             for (var j = 0; j < datePart.pattern.length; j++) {
@@ -556,13 +564,23 @@ var DateObject = /** @class */ (function () {
             }
             i += datePart.pattern.length - 1;
         }
+        for (var i = 0; i < flatDateParts.length; i++) {
+            var datePart = flatDateParts[i];
+            for (var j = 0; j < datePart.pattern.length; j++) {
+                if (flatDateParts[i + j]) {
+                    flatDateParts[i + j].text = datePart.pattern[j];
+                }
+            }
+            i += datePart.pattern.length - 1;
+        }
         var shouldResetPart = isInCaretMode && symbol === "M" && dateParts.partMap
             .filter(function (x) { return x.type === "month"; })
             .some(function (x) { return x.pattern.length > MONTH_PART_WITH_WORDS_THRESHOLD; });
         var parseResult = {
             value: null,
             switchPart: false,
-            resetPart: shouldResetPart
+            resetPart: shouldResetPart,
+            hasInvalidDatePart: false
         };
         if (!currentChar) {
             if (isInCaretMode) {
@@ -596,14 +614,20 @@ var DateObject = /** @class */ (function () {
         var basePrefix = '';
         var baseSuffix = '';
         var suffix = '';
-        var datePartStartIndex = originalFormat.indexOf(symbol);
-        var datePartEndIndex = originalFormat.lastIndexOf(symbol);
-        var segmentLength = datePartEndIndex - datePartStartIndex + 1;
+        var convertedBaseFormat = "";
+        for (var i = 0; i < flatDateParts.length; i++) {
+            convertedBaseFormat += flatDateParts[i].text;
+        }
         var hasFixedFormat = (this.format === baseFormat) ||
+            (this.format === convertedBaseFormat) ||
             (this.format === originalFormat) ||
             (this.format.length === originalFormat.length);
-        if (isInCaretMode) {
-            var processedSegmentCharsCount = 0;
+        var datePartStartIndex = (hasFixedFormat ? convertedBaseFormat : originalFormat).indexOf(symbol);
+        var datePartEndIndex = (hasFixedFormat ? convertedBaseFormat : originalFormat).lastIndexOf(symbol);
+        var segmentLength = datePartEndIndex - datePartStartIndex + 1;
+        var processedSegmentCharsCount = 0;
+        var formatToTextLengthDiff = originalFormat.length - rawInputValue.length;
+        if (isInCaretMode || (!isInCaretMode && !this.autoCorrectParts)) {
             for (var i = 0; i < baseDate.length; i++) {
                 if (baseFormat[i] === symbol) {
                     var existing = this.getExisting(symbol);
@@ -615,6 +639,11 @@ var DateObject = /** @class */ (function () {
                         }
                         processedSegmentCharsCount++;
                     }
+                    else if (formatToTextLengthDiff > 0) {
+                        if (datePartText.length + formatToTextLengthDiff < segmentLength) {
+                            datePartText += rawInputValue[i] || "";
+                        }
+                    }
                     else {
                         datePartText += rawInputValue[i] || "";
                     }
@@ -630,12 +659,12 @@ var DateObject = /** @class */ (function () {
                 }
             }
             if (hasFixedFormat) {
-                if (originalFormat.length < rawInputValue.length) {
+                if (convertedBaseFormat.length < rawInputValue.length) {
                     datePartText += currentChar;
                 }
                 else if (!isDeleting && originalFormat.length > rawInputValue.length) {
                     var lengthDiff = originalFormat.length - rawInputValue.length;
-                    var trimmedDatePartText = datePartText.substring(0, datePartText.length - lengthDiff);
+                    var trimmedDatePartText = datePartText.substr(0, datePartText.length - lengthDiff);
                     if (trimmedDatePartText && trimmedDatePartText.length > 0) {
                         datePartText = trimmedDatePartText;
                     }
@@ -644,7 +673,7 @@ var DateObject = /** @class */ (function () {
                     return utils_2.extend(parseResult, { value: null, switchToNext: false });
                 }
             }
-            else {
+            if (!hasFixedFormat || (hasFixedFormat && !this.autoCorrectParts)) {
                 processedSegmentCharsCount = 0;
                 current = "";
                 datePartText = "";
@@ -662,6 +691,11 @@ var DateObject = /** @class */ (function () {
                             }
                             processedSegmentCharsCount++;
                         }
+                        else if (formatToTextLengthDiff > 0) {
+                            if (datePartText.length + formatToTextLengthDiff < segmentLength) {
+                                datePartText += rawInputValue[i] || "";
+                            }
+                        }
                         else {
                             datePartText += rawInputValue[i] || "";
                         }
@@ -671,43 +705,52 @@ var DateObject = /** @class */ (function () {
                         prefix += rawInputValue[i] || "";
                     }
                     else {
-                        suffix += rawInputValue[i] || "";
+                        suffix += rawInputValue[i - formatToTextLengthDiff] || "";
                     }
                 }
                 if (originalFormat.length < rawInputValue.length) {
                     datePartText += currentChar;
                 }
-                else if (!isDeleting && originalFormat.length > rawInputValue.length) {
-                    var lengthDiff = originalFormat.length - rawInputValue.length;
-                    var trimmedDatePartText = datePartText.substring(0, datePartText.length - lengthDiff);
-                    if (trimmedDatePartText && trimmedDatePartText.length > 0) {
-                        datePartText = trimmedDatePartText;
-                    }
-                }
             }
         }
-        else {
-            for (var i = 0; i < baseDate.length; i++) {
-                if (baseFormat[i] === symbol) {
-                    var existing = this.getExisting(symbol);
-                    current += existing ? baseDate[i] : '0';
-                    replaced = true;
-                }
-                else if (!replaced) {
-                    prefix += baseDate[i];
-                }
-                else {
-                    suffix += baseDate[i];
+        if (!isInCaretMode) {
+            if (this.autoCorrectParts) {
+                processedSegmentCharsCount = 0;
+                current = "";
+                datePartText = "";
+                prefix = "";
+                suffix = "";
+                replaced = false;
+                for (var i = 0; i < baseDate.length; i++) {
+                    if (baseFormat[i] === symbol) {
+                        var existing = this.getExisting(symbol);
+                        current += existing ? baseDate[i] : '0';
+                        replaced = true;
+                    }
+                    else if (!replaced) {
+                        prefix += baseDate[i];
+                    }
+                    else {
+                        suffix += baseDate[i];
+                    }
                 }
             }
+            else {
+                current = resetSegmentValue ? datePartText : current;
+            }
         }
         var parsedDate = null;
         var month = this.matchMonth(currentChar);
         var dayPeriod = this.matchDayPeriod(currentChar, symbol);
         var isZeroCurrentChar = currentChar === '0';
         var leadingZero = this.leadingZero || {};
-        if (isZeroCurrentChar && !isInCaretMode) {
-            var valueNumber = parseInt(resetSegmentValue ? currentChar : current + currentChar, 10);
+        if (isZeroCurrentChar) {
+            if (datePartText === "0") {
+                datePartText = current;
+            }
+            var valueNumber = utils_2.parseToInt(resetSegmentValue ?
+                currentChar :
+                (isInCaretMode ? datePartText : current) + currentChar);
             if (valueNumber === 0 && !this.isAbbrMonth(dateParts.partMap, symbol)) {
                 this.incrementLeadingZero(symbol);
             }
@@ -725,32 +768,25 @@ var DateObject = /** @class */ (function () {
         }
         var currentMaxLength = current.length - 3;
         var tryParse = true;
+        var middle = isInCaretMode ? datePartText : current;
         for (var i = Math.max(0, currentMaxLength); i <= current.length; i++) {
             if (!tryParse) {
                 break;
             }
-            var middle = resetSegmentValue ?
+            middle = resetSegmentValue ?
                 currentChar :
                 isInCaretMode ?
                     datePartText :
                     (current.substring(i) + currentChar);
-            if (!this.autoCorrectParts) {
-                tryParse = false;
-                if (!isInCaretMode) {
-                    // try to make an exact match as there will be only 1 attempt
-                    middle = utils_1.unpadZero(middle);
-                    middle = utils_1.padZero(segmentLength - middle.length) + middle;
-                }
-            }
-            if (isInCaretMode) {
-                // try to make an exact match as there will be only 1 attempt
+            if (isInCaretMode || !this.autoCorrectParts) {
                 tryParse = false;
                 middle = utils_1.unpadZero(middle);
+                middle = utils_1.padZero(segmentLength - middle.length) + middle;
             }
             var middleNumber = parseInt(middle, 10);
             var candidateDateString = prefix + middle + suffix;
             parsedDate = this.intl.parseDate(candidateDateString, this.format, this.localeId);
-            if (isInCaretMode && !hasFixedFormat && !utils_2.isValidDate(parsedDate)) {
+            if (isInCaretMode && !utils_2.isValidDate(parsedDate)) {
                 // if part of the date is not available, e.g. "d"
                 // but an expanded format like "F" is used
                 // the element value can be "EEEE, February 1, 2022 3:04:05 AM"
@@ -758,11 +794,12 @@ var DateObject = /** @class */ (function () {
                 // use the base prefix and suffix, e.g. convert the candidate date string
                 // to "Thursday, February 1, 2022 3:04:05 AM"
                 // as "EEEE, February..." is not parsable
-                parsedDate = this.intl.parseDate(basePrefix + middle + baseSuffix, this.format, this.localeId);
-                datePartText = middle;
+                if (this.autoCorrectParts) {
+                    parsedDate = this.intl.parseDate(basePrefix + middle + baseSuffix, this.format, this.localeId);
+                }
             }
             var isCurrentCharParsable = !isNaN(parseInt(currentChar, 10)) || (isInCaretMode && isDeleting && currentChar === "");
-            if (!parsedDate && !isNaN(middleNumber) && isCurrentCharParsable) {
+            if (!parsedDate && !isNaN(middleNumber) && isCurrentCharParsable && this.autoCorrectParts) {
                 if (symbol === MONTH_SYMBOL && !month) {
                     // JS months start from 0 (January) instead of 1 (January)
                     var monthNumber = middleNumber - JS_MONTH_OFFSET;
@@ -797,16 +834,34 @@ var DateObject = /** @class */ (function () {
                 }
                 this._value = parsedDate;
                 this.setExisting(symbol, true);
+                this.resetInvalidDateSymbol(symbol);
+                if (!this.autoCorrectParts) {
+                    if (symbol === "M") {
+                        if (this.getExisting("M") && this.getExisting("y")) {
+                            // changing from 28/Feb to 29/Feb to 29/March
+                            this.setExisting("d", true);
+                            this.resetInvalidDateSymbol("d");
+                        }
+                    }
+                    else if (symbol === "d") {
+                        if (this.getExisting("d") && this.getExisting("y")) {
+                            // changing from 31/Jan to 31/Feb to 28/Feb
+                            this.setExisting("M", true);
+                            this.resetInvalidDateSymbol("M");
+                        }
+                    }
+                    if (!this.hasInvalidDatePart()) {
+                        this.markDatePartsAsExisting();
+                    }
+                }
                 if (isInCaretMode && switchToNext) {
                     if (symbol === "M") {
-                        if (segmentLength <= MONTH_PART_WITH_WORDS_THRESHOLD) {
-                            var datePartValue = utils_2.parseToInt(datePartText);
-                            if (datePartValue >= 2) {
-                                switchToNext = true;
-                            }
-                            else {
-                                switchToNext = false;
-                            }
+                        var datePartValue = utils_2.parseToInt(datePartText);
+                        if (datePartValue >= 2 || datePartText.length >= 2) {
+                            switchToNext = true;
+                        }
+                        else {
+                            switchToNext = false;
                         }
                     }
                     else {
@@ -839,29 +894,157 @@ var DateObject = /** @class */ (function () {
             this.leadingZero = !this.isAbbrMonth(dateParts.partMap, symbol) ? (_b = {}, _b[symbol] = true, _b) : null;
             this.setExisting(symbol, false);
         }
-        if (isInCaretMode && datePartText.length > segmentLength) {
-            return utils_2.extend(parseResult, { value: null, switchToNext: false });
-        }
         if (!this.autoCorrectParts) {
-            this.setExisting(symbol, false);
             var datePartValue = void 0;
-            var textToParse = isInCaretMode ? datePartText : current;
+            var textToParse = isInCaretMode ? datePartText : middle;
             var parsedValue = utils_2.parseToInt(textToParse);
             if (utils_2.isNumber(parsedValue)) {
+                if ((symbol === "d" && (parsedValue <= 0 || parsedValue > 31)) ||
+                    (symbol === "M" && (parsedValue < 0 || parsedValue > 11))) {
+                    return utils_2.extend(parseResult, { value: null, switchToNext: false });
+                }
                 datePartValue = symbol === "M" ?
-                    utils_2.clamp(parsedValue - JS_MONTH_OFFSET, 0, 12 - JS_MONTH_OFFSET) :
+                    parsedValue - JS_MONTH_OFFSET :
                     parsedValue;
-            }
-            if (utils_2.isNumber(datePartValue)) {
-                var newDate = this.modifyDateSymbolWithValue(this.value, symbol, datePartValue);
-                // if (!isEqual(newDate, this.value)) {
-                this.setExisting(symbol, false);
-                this.setInvalidDatePart(symbol, {
-                    value: datePartValue,
-                    date: kendo_date_math_1.cloneDate(newDate),
-                    startDate: this._partiallyInvalidDate.startDate || kendo_date_math_1.cloneDate(this.value)
+                var isMonth = symbol === "M";
+                var isDay = symbol === "d";
+                var newValue = kendo_date_math_1.cloneDate(this._value);
+                var invalidDateParts = this._partiallyInvalidDate.invalidDateParts || {};
+                var year = invalidDateParts.y.value || newValue.getFullYear();
+                /* tslint:disable:no-shadowed-variable */
+                var month_1 = isMonth ? datePartValue : invalidDateParts.M.value || newValue.getMonth();
+                /* tslint:enable:no-shadowed-variable */
+                var day = isDay ? datePartValue : invalidDateParts.d.value || invalidDateParts.E.value || newValue.getDate();
+                var hour = invalidDateParts.h.value || invalidDateParts.H.value || newValue.getHours();
+                var minutes = invalidDateParts.m.value || newValue.getMinutes();
+                var seconds = invalidDateParts.s.value || newValue.getSeconds();
+                var milliseconds = invalidDateParts.S.value || newValue.getMilliseconds();
+                var dateCandidate = kendo_date_math_1.createDate(year, month_1, day, hour, minutes, seconds, milliseconds);
+                var dateCandidateExists = utils_2.areDatePartsEqualTo(dateCandidate, year, month_1, day, hour, minutes, seconds, milliseconds);
+                var newValueCandidate = isMonth || isDay ?
+                    this.modifyDateSymbolWithValue(newValue, symbol, isMonth ? month_1 : day) :
+                    null;
+                var invalidDateFound = false;
+                if (isMonth && newValueCandidate) {
+                    if (newValueCandidate.getMonth() === month_1) {
+                        if (this.getExisting("d")) {
+                            if (dateCandidateExists) {
+                                newValue = kendo_date_math_1.cloneDate(dateCandidate);
+                                this.resetInvalidDateSymbol(symbol);
+                            }
+                            else {
+                                invalidDateFound = true;
+                                this.setInvalidDatePart(symbol, {
+                                    value: month_1,
+                                    date: kendo_date_math_1.cloneDate(newValueCandidate),
+                                    // startDateOffset: offset,
+                                    startDate: kendo_date_math_1.cloneDate(this.value)
+                                });
+                                this.setExisting(symbol, false);
+                            }
+                        }
+                        else if (dateCandidateExists) {
+                            this.resetInvalidDateSymbol(symbol);
+                            newValue = kendo_date_math_1.cloneDate(dateCandidate);
+                            if (this.getExisting("M") && this.getExisting("y")) {
+                                // changing from 28/Feb to 29/Feb to 29/March
+                                this.setExisting("d", true);
+                                this.resetInvalidDateSymbol("d");
+                            }
+                        }
+                        else {
+                            this.resetInvalidDateSymbol(symbol);
+                            newValue = kendo_date_math_1.cloneDate(newValueCandidate);
+                        }
+                    }
+                    else {
+                        invalidDateFound = true;
+                        this.setInvalidDatePart(symbol, {
+                            value: month_1,
+                            date: kendo_date_math_1.cloneDate(newValueCandidate),
+                            // startDateOffset: offset,
+                            startDate: kendo_date_math_1.cloneDate(this.value)
+                        });
+                        this.setExisting(symbol, false);
+                    }
+                }
+                else if (isDay && newValueCandidate) {
+                    if (newValueCandidate.getDate() === day) {
+                        if (this.getExisting("M")) {
+                            if (dateCandidateExists) {
+                                newValue = kendo_date_math_1.cloneDate(dateCandidate);
+                                this.resetInvalidDateSymbol(symbol);
+                            }
+                            else {
+                                invalidDateFound = true;
+                                this.setInvalidDatePart(symbol, {
+                                    value: day,
+                                    date: kendo_date_math_1.cloneDate(newValueCandidate),
+                                    // startDateOffset: offset,
+                                    startDate: kendo_date_math_1.cloneDate(this.value)
+                                });
+                                this.setExisting(symbol, false);
+                            }
+                        }
+                        else if (dateCandidateExists) {
+                            newValue = kendo_date_math_1.cloneDate(dateCandidate);
+                            this.resetInvalidDateSymbol(symbol);
+                            if (this.getExisting("d") && this.getExisting("y")) {
+                                // changing from 31/Jan to 31/Feb to 28/Feb
+                                this.setExisting("M", true);
+                                this.resetInvalidDateSymbol("M");
+                            }
+                        }
+                        else {
+                            this.resetInvalidDateSymbol(symbol);
+                            newValue = kendo_date_math_1.cloneDate(newValueCandidate);
+                        }
+                    }
+                    else {
+                        invalidDateFound = true;
+                        this.setInvalidDatePart(symbol, {
+                            value: day,
+                            date: kendo_date_math_1.cloneDate(this.value),
+                            // startDateOffset: offset,
+                            startDate: kendo_date_math_1.cloneDate(this.value)
+                        });
+                        this.setExisting(symbol, false);
+                    }
+                }
+                if (!invalidDateFound) {
+                    this.setExisting(symbol, true);
+                    if (isInCaretMode && !utils_2.isValidDate(parsedDate)) {
+                        var valueCandidate = this.intl.parseDate(basePrefix + middle + baseSuffix, this.format, this.localeId);
+                        if (utils_2.isValidDate(valueCandidate)) {
+                            this._value = valueCandidate;
+                        }
+                    }
+                    else {
+                        this._value = newValue;
+                    }
+                    if (this.getValue()) {
+                        this.resetInvalidDate();
+                    }
+                }
+                var switchToNext = false;
+                if (symbol === "M") {
+                    if (parsedValue >= 2 || textToParse.length >= 2) {
+                        switchToNext = true;
+                    }
+                    else {
+                        switchToNext = false;
+                    }
+                }
+                else {
+                    switchToNext = hasFixedFormat ?
+                        textToParse.length === segmentLength :
+                        textToParse.length > segmentLength;
+                }
+                return utils_2.extend(parseResult, {
+                    value: null,
+                    switchToNext: switchToNext,
+                    hasInvalidDatePart: invalidDateFound
                 });
-                // }
             }
         }
         return utils_2.extend(parseResult, { value: null, switchToNext: false });
@@ -883,6 +1066,12 @@ var DateObject = /** @class */ (function () {
     DateObject.prototype.setLeadingZero = function (leadingZero) {
         this.leadingZero = leadingZero;
     };
+    /**
+     * @hidden
+     */
+    DateObject.prototype.getLeadingZero = function () {
+        return this.leadingZero || {};
+    };
     /**
      * @hidden
      */
@@ -966,7 +1155,6 @@ var DateObject = /** @class */ (function () {
         var dateFormatParts = this.intl.splitDateFormat(this.format, this.localeId);
         for (var i = 0; i < dateFormatParts.length; i++) {
             if (dateFormatParts[i].type === 'month' && dateFormatParts[i].names) {
-                // return this.intl.dateFormatNames(dateFormatParts[i].names);
                 return this.intl.dateFormatNames(locale, dateFormatParts[i].names);
             }
         }
@@ -1078,13 +1266,16 @@ var DateObject = /** @class */ (function () {
                             }
                             else {
                                 datePartText = (utils_2.parseToInt(this.getInvalidDatePartValue(symbol)) + JS_MONTH_OFFSET).toString();
-                                resultText = datePartText + resultText;
+                                var formattedDatePart = utils_1.padZero(partsForSegment.length - datePartText.length) + datePartText;
+                                resultText = formattedDatePart + resultText;
+                                formatSymbolIndexModifier = partsForSegment.length - 1;
                                 ignoreFormatSymbolsCount = datePartText.length - partsForSegment.length;
                             }
                         }
                         else {
-                            resultText = datePartText + resultText;
-                            formatSymbolIndexModifier = datePartText.length - 1;
+                            var formattedDatePart = utils_1.padZero(partsForSegment.length - datePartText.length) + datePartText;
+                            resultText = formattedDatePart + resultText;
+                            formatSymbolIndexModifier = partsForSegment.length - 1;
                             ignoreFormatSymbolsCount = datePartText.length - partsForSegment.length;
                         }
                     }
@@ -1182,6 +1373,20 @@ var DateObject = /** @class */ (function () {
             this._partiallyInvalidDate.startDate = startDate;
         }
     };
+    /**
+     * @hidden
+     */
+    DateObject.prototype.hasInvalidDatePart = function () {
+        var _this = this;
+        var hasInvalidDatePart = false;
+        Object.keys(this._partiallyInvalidDate.invalidDateParts).forEach(function (key) {
+            if (_this._partiallyInvalidDate.invalidDateParts[key] &&
+                utils_2.isPresent(_this._partiallyInvalidDate.invalidDateParts[key].value)) {
+                hasInvalidDatePart = true;
+            }
+        });
+        return hasInvalidDatePart;
+    };
     /**
      * @hidden
      */

package/dist/npm/dateinput/dateinput.d.ts

@@ -9,6 +9,7 @@ export declare class DateInput extends Observable {
     private resetSegmentValue;
     private isActive;
     private interactionMode;
+    private formatStateOnKeyDown;
     private previousElementValue;
     private previousElementSelection;
     private keyDownEvent;