@progress/kendo-dateinputs-common 0.2.0-dev.202301130811 → 0.2.0-dev.202301161405

package/dist/es/common/dateobject.js

@@ -600,8 +600,8 @@ var DateObject = /** @class */ (function () {
         var hasFixedFormat = (this.format === baseFormat) ||
             (this.format === originalFormat) ||
             (this.format.length === originalFormat.length);
-        if (isInCaretMode) {
-            var processedSegmentCharsCount = 0;
+        var processedSegmentCharsCount = 0;
+        if (isInCaretMode || (!isInCaretMode && !this.autoCorrectParts)) {
             for (var i = 0; i < baseDate.length; i++) {
                 if (baseFormat[i] === symbol) {
                     var existing = this.getExisting(symbol);
@@ -627,10 +627,17 @@ var DateObject = /** @class */ (function () {
                     baseSuffix += baseDate[i];
                 }
             }
-            if (hasFixedFormat) {
+            if (hasFixedFormat && this.autoCorrectParts) {
                 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;
+                    }
+                }
                 if (datePartText.length > segmentLength) {
                     return extend(parseResult, { value: null, switchToNext: false });
                 }
@@ -668,22 +675,45 @@ var DateObject = /** @class */ (function () {
                 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) {
+                        var originalDatePartText = datePartText;
+                        datePartText = trimmedDatePartText;
+                        if (prefix + datePartText + suffix !== rawInputValue) {
+                            // move trimmed characters to the suffix
+                            suffix = originalDatePartText.substring(datePartText.length) + suffix;
+                        }
+                    }
+                }
             }
         }
-        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);
@@ -709,18 +739,24 @@ 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;
             }
-            if (!this.autoCorrectParts) {
-                tryParse = false;
-            }
-            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 = unpadZero(middle);
+                    middle = padZero(segmentLength - middle.length) + middle;
+                }
+            }
             if (isInCaretMode) {
                 // try to make an exact match as there will be only 1 attempt
                 tryParse = false;
@@ -737,11 +773,13 @@ 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);
+                    datePartText = middle;
+                }
             }
             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;
@@ -776,6 +814,26 @@ 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) {
@@ -822,28 +880,30 @@ var DateObject = /** @class */ (function () {
             return extend(parseResult, { value: null, switchToNext: false });
         }
         if (!this.autoCorrectParts) {
-            this.setExisting(symbol, false);
-            // todo check if string is better
-            // const padPrefix = padZero(Math.abs(current.length - datePartText.length));
-            // const paddedDatePartText = padPrefix + datePartText;
             var datePartValue = void 0;
-            var textToParse = isInCaretMode ? datePartText : current;
+            var textToParse = isInCaretMode ? datePartText : middle;
             var parsedValue = parseToInt(textToParse);
             if (isNumber(parsedValue)) {
+                if ((symbol === "d" && (parsedValue <= 0 || parsedValue > 31)) ||
+                    (symbol === "M" && (parsedValue < 0 || parsedValue > 11))) {
+                    return extend(parseResult, { value: null, switchToNext: false });
+                }
                 datePartValue = symbol === "M" ?
                     clamp(parsedValue - JS_MONTH_OFFSET, 0, 12 - JS_MONTH_OFFSET) :
                     parsedValue;
-            }
-            if (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: cloneDate(newDate),
+                    date: cloneDate(this.value),
                     startDate: this._partiallyInvalidDate.startDate || cloneDate(this.value)
                 });
                 // }
+                return extend(parseResult, {
+                    value: null,
+                    switchToNext: false,
+                    hasInvalidDatePart: true
+                });
             }
         }
         return extend(parseResult, { value: null, switchToNext: false });
@@ -1060,13 +1120,16 @@ var DateObject = /** @class */ (function () {
                             }
                             else {
                                 datePartText = (parseToInt(this.getInvalidDatePartValue(symbol)) + JS_MONTH_OFFSET).toString();
-                                resultText = datePartText + resultText;
+                                var formattedDatePart = 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 = padZero(partsForSegment.length - datePartText.length) + datePartText;
+                            resultText = formattedDatePart + resultText;
+                            formatSymbolIndexModifier = partsForSegment.length - 1;
                             ignoreFormatSymbolsCount = datePartText.length - partsForSegment.length;
                         }
                     }
@@ -1157,13 +1220,34 @@ var DateObject = /** @class */ (function () {
     };
     DateObject.prototype.setInvalidDatePart = function (symbol, _a) {
         var _b = _a.value, value = _b === void 0 ? null : _b, _c = _a.date, date = _c === void 0 ? null : _c, _d = _a.startDateOffset, startDateOffset = _d === void 0 ? 0 : _d, _e = _a.startDate, startDate = _e === void 0 ? null : _e;
+        var clampedValue = value;
+        if (symbol === "d") {
+            clampedValue = clamp(isPresent(value) ? value : 1, 1, 31);
+        }
+        else if (symbol === "M") {
+            clampedValue = clamp(isPresent(value) ? value : 0, 0, 11);
+        }
         if (this._partiallyInvalidDate.invalidDateParts[symbol]) {
-            this._partiallyInvalidDate.invalidDateParts[symbol].value = value;
+            this._partiallyInvalidDate.invalidDateParts[symbol].value = clampedValue;
             this._partiallyInvalidDate.invalidDateParts[symbol].date = date;
             this._partiallyInvalidDate.invalidDateParts[symbol].startDateOffset = startDateOffset;
             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] &&
+                isPresent(_this._partiallyInvalidDate.invalidDateParts[key].value)) {
+                hasInvalidDatePart = true;
+            }
+        });
+        return hasInvalidDatePart;
+    };
     /**
      * @hidden
      */

package/dist/es/dateinput/dateinput.js

@@ -344,6 +344,7 @@ var DateInput = /** @class */ (function (_super) {
         var lastParseResultHasNoValue = lastParseResult && !lastParseResult.value;
         var parsingFailedOnDelete = (hasCaret && (isBackspaceKey || isDeleteKey) && lastParseResultHasNoValue);
         var resetPart = lastParseResult ? lastParseResult.resetPart : false;
+        var hasInvalidDatePart = lastParseResult ? lastParseResult.hasInvalidDatePart : false;
         var hasDateValueChanged = !isEqual(oldDateObjectValue, this.dateObject.value);
         var symbolForSelection;
         var currentSelection = this.selection;
@@ -369,20 +370,14 @@ var DateInput = /** @class */ (function (_super) {
                 }
             }
             else if (hasCaret) {
-                if (this.options.format.length !== this.currentFormat.length) {
-                    if (hasDateValueChanged && isPresent(this.dateObject.getValue())) {
-                        if (switchPart) {
-                            this.switchDateSegment(1);
-                        }
+                if ((hasDateValueChanged && isPresent(this.dateObject.getValue()) ||
+                    (!hasDateValueChanged && switchPart && isPresent(this.dateObject.getValue())))) {
+                    if (switchPart) {
+                        this.switchDateSegment(1);
                     }
                 }
                 else {
-                    if (hasDateValueChanged) {
-                        if (lastParseResultHasNoValue) {
-                            this.restorePreviousInputEventState();
-                        }
-                    }
-                    else {
+                    if (lastParseResultHasNoValue && !hasInvalidDatePart) {
                         this.restorePreviousInputEventState();
                     }
                 }
@@ -395,20 +390,22 @@ var DateInput = /** @class */ (function (_super) {
                 }
                 else {
                     // the input is not complete, not parsable or not updatable
-                    if (hasCaret && originalInteractionMode !== DateInputInteractionMode.Caret && hasDateValueChanged) {
+                    if (originalInteractionMode !== DateInputInteractionMode.Caret && hasDateValueChanged) {
                     }
-                    else if (hasCaret && originalInteractionMode !== DateInputInteractionMode.Caret) {
+                    else if (originalInteractionMode !== DateInputInteractionMode.Caret) {
                         symbolForSelection = this.currentFormat[currentSelection.start];
                         this.forceUpdate();
                         this.setSelection(this.selectionBySymbol(symbolForSelection));
                     }
-                    else {
+                    else if (!hasInvalidDatePart) {
                         this.restorePreviousInputEventState();
                     }
                 }
             }
             else {
-                this.restorePreviousInputEventState();
+                if (!hasInvalidDatePart) {
+                    this.restorePreviousInputEventState();
+                }
             }
         }
         else if (this.options.autoSwitchParts && (switchPart || navigationOnly)) {
@@ -709,11 +706,12 @@ var DateInput = /** @class */ (function (_super) {
         var selection = this.selection;
         if (this.isInCaretMode()) {
             var start = selection.start;
-            var currentSymbol = this.currentFormat[start - (this.elementValue.length - this.currentFormat.length)];
+            var currentSymbol = this.currentFormat[start - (this.elementValue.length - this.currentFormat.length)] ||
+                this.currentFormat[start];
             var symbol = "";
             var symbolCandidate = "";
             if (offset < 0) {
-                for (var i = 0; i < start + offset; i++) {
+                for (var i = start + offset; i >= 0; i--) {
                     symbolCandidate = this.currentFormat[i];
                     if (symbolCandidate !== Constants.formatSeparator &&
                         symbolCandidate !== currentSymbol) {

package/dist/es2015/common/dateobject.js

@@ -585,8 +585,8 @@ export class DateObject {
         const hasFixedFormat = (this.format === baseFormat) ||
             (this.format === originalFormat) ||
             (this.format.length === originalFormat.length);
-        if (isInCaretMode) {
-            let processedSegmentCharsCount = 0;
+        let processedSegmentCharsCount = 0;
+        if (isInCaretMode || (!isInCaretMode && !this.autoCorrectParts)) {
             for (let i = 0; i < baseDate.length; i++) {
                 if (baseFormat[i] === symbol) {
                     const existing = this.getExisting(symbol);
@@ -612,10 +612,17 @@ export class DateObject {
                     baseSuffix += baseDate[i];
                 }
             }
-            if (hasFixedFormat) {
+            if (hasFixedFormat && this.autoCorrectParts) {
                 if (originalFormat.length < rawInputValue.length) {
                     datePartText += currentChar;
                 }
+                else if (!isDeleting && originalFormat.length > rawInputValue.length) {
+                    const lengthDiff = originalFormat.length - rawInputValue.length;
+                    const trimmedDatePartText = datePartText.substring(0, datePartText.length - lengthDiff);
+                    if (trimmedDatePartText && trimmedDatePartText.length > 0) {
+                        datePartText = trimmedDatePartText;
+                    }
+                }
                 if (datePartText.length > segmentLength) {
                     return extend(parseResult, { value: null, switchToNext: false });
                 }
@@ -653,22 +660,45 @@ export class DateObject {
                 if (originalFormat.length < rawInputValue.length) {
                     datePartText += currentChar;
                 }
+                else if (!isDeleting && originalFormat.length > rawInputValue.length) {
+                    const lengthDiff = originalFormat.length - rawInputValue.length;
+                    const trimmedDatePartText = datePartText.substring(0, datePartText.length - lengthDiff);
+                    if (trimmedDatePartText && trimmedDatePartText.length > 0) {
+                        const originalDatePartText = datePartText;
+                        datePartText = trimmedDatePartText;
+                        if (prefix + datePartText + suffix !== rawInputValue) {
+                            // move trimmed characters to the suffix
+                            suffix = originalDatePartText.substring(datePartText.length) + suffix;
+                        }
+                    }
+                }
             }
         }
-        else {
-            for (let i = 0; i < baseDate.length; i++) {
-                if (baseFormat[i] === symbol) {
-                    const 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 (let i = 0; i < baseDate.length; i++) {
+                    if (baseFormat[i] === symbol) {
+                        const 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;
+            }
         }
         let parsedDate = null;
         const month = this.matchMonth(currentChar);
@@ -694,18 +724,24 @@ export class DateObject {
         }
         const currentMaxLength = current.length - 3;
         let tryParse = true;
+        let middle = isInCaretMode ? datePartText : current;
         for (let i = Math.max(0, currentMaxLength); i <= current.length; i++) {
             if (!tryParse) {
                 break;
             }
-            if (!this.autoCorrectParts) {
-                tryParse = false;
-            }
-            let 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 = unpadZero(middle);
+                    middle = padZero(segmentLength - middle.length) + middle;
+                }
+            }
             if (isInCaretMode) {
                 // try to make an exact match as there will be only 1 attempt
                 tryParse = false;
@@ -722,11 +758,13 @@ export class DateObject {
                 // 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);
+                    datePartText = middle;
+                }
             }
             const 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)
                     const monthNumber = middleNumber - JS_MONTH_OFFSET;
@@ -761,6 +799,26 @@ export class DateObject {
                 }
                 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) {
@@ -807,28 +865,30 @@ export class DateObject {
             return extend(parseResult, { value: null, switchToNext: false });
         }
         if (!this.autoCorrectParts) {
-            this.setExisting(symbol, false);
-            // todo check if string is better
-            // const padPrefix = padZero(Math.abs(current.length - datePartText.length));
-            // const paddedDatePartText = padPrefix + datePartText;
             let datePartValue;
-            const textToParse = isInCaretMode ? datePartText : current;
+            const textToParse = isInCaretMode ? datePartText : middle;
             const parsedValue = parseToInt(textToParse);
             if (isNumber(parsedValue)) {
+                if ((symbol === "d" && (parsedValue <= 0 || parsedValue > 31)) ||
+                    (symbol === "M" && (parsedValue < 0 || parsedValue > 11))) {
+                    return extend(parseResult, { value: null, switchToNext: false });
+                }
                 datePartValue = symbol === "M" ?
                     clamp(parsedValue - JS_MONTH_OFFSET, 0, 12 - JS_MONTH_OFFSET) :
                     parsedValue;
-            }
-            if (isNumber(datePartValue)) {
-                const newDate = this.modifyDateSymbolWithValue(this.value, symbol, datePartValue);
                 // if (!isEqual(newDate, this.value)) {
                 this.setExisting(symbol, false);
                 this.setInvalidDatePart(symbol, {
                     value: datePartValue,
-                    date: cloneDate(newDate),
+                    date: cloneDate(this.value),
                     startDate: this._partiallyInvalidDate.startDate || cloneDate(this.value)
                 });
                 // }
+                return extend(parseResult, {
+                    value: null,
+                    switchToNext: false,
+                    hasInvalidDatePart: true
+                });
             }
         }
         return extend(parseResult, { value: null, switchToNext: false });
@@ -1043,13 +1103,16 @@ export class DateObject {
                             }
                             else {
                                 datePartText = (parseToInt(this.getInvalidDatePartValue(symbol)) + JS_MONTH_OFFSET).toString();
-                                resultText = datePartText + resultText;
+                                const formattedDatePart = 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;
+                            const formattedDatePart = padZero(partsForSegment.length - datePartText.length) + datePartText;
+                            resultText = formattedDatePart + resultText;
+                            formatSymbolIndexModifier = partsForSegment.length - 1;
                             ignoreFormatSymbolsCount = datePartText.length - partsForSegment.length;
                         }
                     }
@@ -1137,13 +1200,33 @@ export class DateObject {
         return (invalidDatePart || {}).value;
     }
     setInvalidDatePart(symbol, { value = null, date = null, startDateOffset = 0, startDate = null }) {
+        let clampedValue = value;
+        if (symbol === "d") {
+            clampedValue = clamp(isPresent(value) ? value : 1, 1, 31);
+        }
+        else if (symbol === "M") {
+            clampedValue = clamp(isPresent(value) ? value : 0, 0, 11);
+        }
         if (this._partiallyInvalidDate.invalidDateParts[symbol]) {
-            this._partiallyInvalidDate.invalidDateParts[symbol].value = value;
+            this._partiallyInvalidDate.invalidDateParts[symbol].value = clampedValue;
             this._partiallyInvalidDate.invalidDateParts[symbol].date = date;
             this._partiallyInvalidDate.invalidDateParts[symbol].startDateOffset = startDateOffset;
             this._partiallyInvalidDate.startDate = startDate;
         }
     }
+    /**
+     * @hidden
+     */
+    hasInvalidDatePart() {
+        let hasInvalidDatePart = false;
+        Object.keys(this._partiallyInvalidDate.invalidDateParts).forEach(key => {
+            if (this._partiallyInvalidDate.invalidDateParts[key] &&
+                isPresent(this._partiallyInvalidDate.invalidDateParts[key].value)) {
+                hasInvalidDatePart = true;
+            }
+        });
+        return hasInvalidDatePart;
+    }
     /**
      * @hidden
      */

package/dist/es2015/dateinput/dateinput.js

@@ -335,6 +335,7 @@ export class DateInput extends Observable {
         const lastParseResultHasNoValue = lastParseResult && !lastParseResult.value;
         const parsingFailedOnDelete = (hasCaret && (isBackspaceKey || isDeleteKey) && lastParseResultHasNoValue);
         const resetPart = lastParseResult ? lastParseResult.resetPart : false;
+        const hasInvalidDatePart = lastParseResult ? lastParseResult.hasInvalidDatePart : false;
         const hasDateValueChanged = !isEqual(oldDateObjectValue, this.dateObject.value);
         let symbolForSelection;
         const currentSelection = this.selection;
@@ -360,20 +361,14 @@ export class DateInput extends Observable {
                 }
             }
             else if (hasCaret) {
-                if (this.options.format.length !== this.currentFormat.length) {
-                    if (hasDateValueChanged && isPresent(this.dateObject.getValue())) {
-                        if (switchPart) {
-                            this.switchDateSegment(1);
-                        }
+                if ((hasDateValueChanged && isPresent(this.dateObject.getValue()) ||
+                    (!hasDateValueChanged && switchPart && isPresent(this.dateObject.getValue())))) {
+                    if (switchPart) {
+                        this.switchDateSegment(1);
                     }
                 }
                 else {
-                    if (hasDateValueChanged) {
-                        if (lastParseResultHasNoValue) {
-                            this.restorePreviousInputEventState();
-                        }
-                    }
-                    else {
+                    if (lastParseResultHasNoValue && !hasInvalidDatePart) {
                         this.restorePreviousInputEventState();
                     }
                 }
@@ -386,20 +381,22 @@ export class DateInput extends Observable {
                 }
                 else {
                     // the input is not complete, not parsable or not updatable
-                    if (hasCaret && originalInteractionMode !== DateInputInteractionMode.Caret && hasDateValueChanged) {
+                    if (originalInteractionMode !== DateInputInteractionMode.Caret && hasDateValueChanged) {
                     }
-                    else if (hasCaret && originalInteractionMode !== DateInputInteractionMode.Caret) {
+                    else if (originalInteractionMode !== DateInputInteractionMode.Caret) {
                         symbolForSelection = this.currentFormat[currentSelection.start];
                         this.forceUpdate();
                         this.setSelection(this.selectionBySymbol(symbolForSelection));
                     }
-                    else {
+                    else if (!hasInvalidDatePart) {
                         this.restorePreviousInputEventState();
                     }
                 }
             }
             else {
-                this.restorePreviousInputEventState();
+                if (!hasInvalidDatePart) {
+                    this.restorePreviousInputEventState();
+                }
             }
         }
         else if (this.options.autoSwitchParts && (switchPart || navigationOnly)) {
@@ -684,11 +681,12 @@ export class DateInput extends Observable {
         const selection = this.selection;
         if (this.isInCaretMode()) {
             let start = selection.start;
-            const currentSymbol = this.currentFormat[start - (this.elementValue.length - this.currentFormat.length)];
+            const currentSymbol = this.currentFormat[start - (this.elementValue.length - this.currentFormat.length)] ||
+                this.currentFormat[start];
             let symbol = "";
             let symbolCandidate = "";
             if (offset < 0) {
-                for (let i = 0; i < start + offset; i++) {
+                for (let i = start + offset; i >= 0; i--) {
                     symbolCandidate = this.currentFormat[i];
                     if (symbolCandidate !== Constants.formatSeparator &&
                         symbolCandidate !== currentSymbol) {