ngx-mask 11.1.2 → 12.0.0

package/bundles/ngx-mask.umd.js

@@ -100,6 +100,8 @@
         return extendStatics(d, b);
     };
     function __extends(d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -285,11 +287,13 @@
         }
         return ar;
     }
+    /** @deprecated */
     function __spread() {
         for (var ar = [], i = 0; i < arguments.length; i++)
             ar = ar.concat(__read(arguments[i]));
         return ar;
     }
+    /** @deprecated */
     function __spreadArrays() {
         for (var s = 0, i = 0, il = arguments.length; i < il; i++)
             s += arguments[i].length;
@@ -298,7 +302,11 @@
                 r[k] = a[j];
         return r;
     }
-    ;
+    function __spreadArray(to, from) {
+        for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+            to[j] = from[i];
+        return to;
+    }
     function __await(v) {
         return this instanceof __await ? (this.v = v, this) : new __await(v);
     }
@@ -363,18 +371,21 @@
     function __importDefault(mod) {
         return (mod && mod.__esModule) ? mod : { default: mod };
     }
-    function __classPrivateFieldGet(receiver, privateMap) {
-        if (!privateMap.has(receiver)) {
-            throw new TypeError("attempted to get private field on non-instance");
-        }
-        return privateMap.get(receiver);
+    function __classPrivateFieldGet(receiver, state, kind, f) {
+        if (kind === "a" && !f)
+            throw new TypeError("Private accessor was defined without a getter");
+        if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver))
+            throw new TypeError("Cannot read private member from an object whose class did not declare it");
+        return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
     }
-    function __classPrivateFieldSet(receiver, privateMap, value) {
-        if (!privateMap.has(receiver)) {
-            throw new TypeError("attempted to set private field on non-instance");
-        }
-        privateMap.set(receiver, value);
-        return value;
+    function __classPrivateFieldSet(receiver, state, value, kind, f) {
+        if (kind === "m")
+            throw new TypeError("Private method is not writable");
+        if (kind === "a" && !f)
+            throw new TypeError("Private accessor was defined without a setter");
+        if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver))
+            throw new TypeError("Cannot write private member to an object whose class did not declare it");
+        return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
     }
 
     var MaskApplierService = /** @class */ (function () {
@@ -419,6 +430,17 @@
                 }
                 return Infinity;
             };
+            this.checkAndRemoveSuffix = function (inputValue) {
+                var _a, _b, _c;
+                for (var i = ((_a = _this.suffix) === null || _a === void 0 ? void 0 : _a.length) - 1; i >= 0; i--) {
+                    var substr = _this.suffix.substr(i, (_b = _this.suffix) === null || _b === void 0 ? void 0 : _b.length);
+                    if (inputValue.includes(substr) &&
+                        (i - 1 < 0 || !inputValue.includes(_this.suffix.substr(i - 1, (_c = _this.suffix) === null || _c === void 0 ? void 0 : _c.length)))) {
+                        return inputValue.replace(substr, '');
+                    }
+                }
+                return inputValue;
+            };
             this.checkInputPrecision = function (inputValue, precision, decimalMarker) {
                 if (precision < Infinity) {
                     var precisionRegEx = new RegExp(_this._charToRegExpExpression(decimalMarker) + ("\\d{" + precision + "}.*$"));
@@ -451,13 +473,15 @@
             this.leadZeroDateTime = this._config.leadZeroDateTime;
         }
         MaskApplierService.prototype.applyMaskWithPattern = function (inputValue, maskAndPattern) {
-            var _a = __read(maskAndPattern, 2), mask = _a[0], customPattern = _a[1];
+            var _d = __read(maskAndPattern, 2), mask = _d[0], customPattern = _d[1];
             this.customPattern = customPattern;
             return this.applyMask(inputValue, mask);
         };
-        MaskApplierService.prototype.applyMask = function (inputValue, maskExpression, position, justPasted, cb) {
+        MaskApplierService.prototype.applyMask = function (inputValue, maskExpression, position, justPasted, backspaced, cb) {
+            var _this = this;
             if (position === void 0) { position = 0; }
             if (justPasted === void 0) { justPasted = false; }
+            if (backspaced === void 0) { backspaced = false; }
             if (cb === void 0) { cb = function () { }; }
             if (inputValue === undefined || inputValue === null || maskExpression === undefined) {
                 return '';
@@ -471,8 +495,8 @@
             if (inputValue.slice(0, this.prefix.length) === this.prefix) {
                 inputValue = inputValue.slice(this.prefix.length, inputValue.length);
             }
-            if (!!this.suffix && inputValue.endsWith(this.suffix)) {
-                inputValue = inputValue.slice(0, inputValue.length - this.suffix.length);
+            if (!!this.suffix && (inputValue === null || inputValue === void 0 ? void 0 : inputValue.length) > 0) {
+                inputValue = this.checkAndRemoveSuffix(inputValue);
             }
             var inputArray = inputValue.toString().split('');
             if (maskExpression === 'IP') {
@@ -520,7 +544,7 @@
                     inputValue = this._stripToDecimal(inputValue);
                 }
                 inputValue =
-                    inputValue.length > 1 && inputValue[0] === '0' && inputValue[1] !== this.decimalMarker
+                    inputValue.length > 1 && inputValue[0] === '0' && inputValue[1] !== this.decimalMarker && !backspaced
                         ? inputValue.slice(1, inputValue.length)
                         : inputValue;
                 // TODO: we had different rexexps here for the different cases... but tests dont seam to bother - check this
@@ -748,7 +772,11 @@
             if (shift < 0) {
                 this._shift.clear();
             }
-            var res = "" + this.prefix + result + this.suffix;
+            var onlySpecial = false;
+            if (backspaced) {
+                onlySpecial = inputArray.every(function (char) { return _this.maskSpecialCharacters.includes(char); });
+            }
+            var res = "" + this.prefix + (onlySpecial ? '' : result) + this.suffix;
             if (result.length === 0) {
                 res = "" + this.prefix + result;
             }
@@ -815,14 +843,16 @@
              * since writeValue should be a one way only process of writing the DOM value based on the Angular model value.
              */
             _this.writingValue = false;
+            _this.maskChanged = false;
             _this.onChange = function (_) { };
             return _this;
         }
         // tslint:disable-next-line:cyclomatic-complexity
-        MaskService.prototype.applyMask = function (inputValue, maskExpression, position, justPasted, cb) {
+        MaskService.prototype.applyMask = function (inputValue, maskExpression, position, justPasted, backspaced, cb) {
             var _this = this;
             if (position === void 0) { position = 0; }
             if (justPasted === void 0) { justPasted = false; }
+            if (backspaced === void 0) { backspaced = false; }
             if (cb === void 0) { cb = function () { }; }
             if (!maskExpression) {
                 return inputValue;
@@ -840,7 +870,7 @@
             }
             var getSymbol = !!inputValue && typeof this.selStart === 'number' ? inputValue[this.selStart] : '';
             var newInputValue = '';
-            if (this.hiddenInput !== undefined) {
+            if (this.hiddenInput && !this.writingValue) {
                 var actualResult = this.actualValue.split('');
                 // tslint:disable no-unused-expression
                 inputValue !== '' && actualResult.length
@@ -855,10 +885,13 @@
                         : null
                     : (actualResult = []);
                 // tslint:enable no-unused-expression
-                newInputValue = this.actualValue.length ? this.shiftTypedSymbols(actualResult.join('')) : inputValue;
+                newInputValue =
+                    this.actualValue.length && actualResult.length <= inputValue.length
+                        ? this.shiftTypedSymbols(actualResult.join(''))
+                        : inputValue;
             }
             newInputValue = Boolean(newInputValue) && newInputValue.length ? newInputValue : inputValue;
-            var result = _super.prototype.applyMask.call(this, newInputValue, maskExpression, position, justPasted, cb);
+            var result = _super.prototype.applyMask.call(this, newInputValue, maskExpression, position, justPasted, backspaced, cb);
             this.actualValue = this.getActualValue(result);
             // handle some separator implications:
             // a.) adjust decimalMarker default (. -> ,) if thousandSeparator is a dot
@@ -898,11 +931,11 @@
             }
             return countSkipedSymbol;
         };
-        MaskService.prototype.applyValueChanges = function (position, justPasted, cb) {
+        MaskService.prototype.applyValueChanges = function (position, justPasted, backspaced, cb) {
             if (position === void 0) { position = 0; }
             if (cb === void 0) { cb = function () { }; }
             var formElement = this._elementRef.nativeElement;
-            formElement.value = this.applyMask(formElement.value, this.maskExpression, position, justPasted, cb);
+            formElement.value = this.applyMask(formElement.value, this.maskExpression, position, justPasted, backspaced, cb);
             if (formElement === this.document.activeElement) {
                 return;
             }
@@ -1079,7 +1112,8 @@
          * @param inputValue the current form input value
          */
         MaskService.prototype.formControlResult = function (inputValue) {
-            if (this.writingValue) {
+            if (this.writingValue || this.maskChanged) {
+                this.maskChanged = false;
                 return;
             }
             if (Array.isArray(this.dropSpecialCharacters)) {
@@ -1093,7 +1127,7 @@
             }
         };
         MaskService.prototype._toNumber = function (value) {
-            if (!this.isNumberValue) {
+            if (!this.isNumberValue || value === '') {
                 return value;
             }
             var num = Number(value);
@@ -1200,6 +1234,9 @@
         MaskDirective.prototype.ngOnChanges = function (changes) {
             var maskExpression = changes.maskExpression, specialCharacters = changes.specialCharacters, patterns = changes.patterns, prefix = changes.prefix, suffix = changes.suffix, thousandSeparator = changes.thousandSeparator, decimalMarker = changes.decimalMarker, dropSpecialCharacters = changes.dropSpecialCharacters, hiddenInput = changes.hiddenInput, showMaskTyped = changes.showMaskTyped, placeHolderCharacter = changes.placeHolderCharacter, shownMaskExpression = changes.shownMaskExpression, showTemplate = changes.showTemplate, clearIfNotMatch = changes.clearIfNotMatch, validation = changes.validation, separatorLimit = changes.separatorLimit, allowNegativeNumbers = changes.allowNegativeNumbers, leadZeroDateTime = changes.leadZeroDateTime;
             if (maskExpression) {
+                if (maskExpression.currentValue !== maskExpression.previousValue && !maskExpression.firstChange) {
+                    this._maskService.maskChanged = true;
+                }
                 this._maskValue = maskExpression.currentValue || '';
                 if (maskExpression.currentValue && maskExpression.currentValue.split('||').length > 1) {
                     this._maskExpressionArray = maskExpression.currentValue.split('||').sort(function (a, b) {
@@ -1273,8 +1310,8 @@
             this._applyMask();
         };
         // tslint:disable-next-line: cyclomatic-complexity
-        MaskDirective.prototype.validate = function (_b) {
-            var value = _b.value;
+        MaskDirective.prototype.validate = function (_c) {
+            var value = _c.value;
             if (!this._maskService.validation || !this._maskValue) {
                 return null;
             }
@@ -1365,7 +1402,7 @@
                 : el.selectionStart;
             var caretShift = 0;
             var backspaceShift = false;
-            this._maskService.applyValueChanges(position, this._justPasted, function (shift, _backspaceShift) {
+            this._maskService.applyValueChanges(position, this._justPasted, this._code === 'Backspace' || this._code === 'Delete', function (shift, _backspaceShift) {
                 _this._justPasted = false;
                 caretShift = shift;
                 backspaceShift = _backspaceShift;
@@ -1381,6 +1418,9 @@
             if (positionToApply > this._getActualInputLength()) {
                 positionToApply = this._getActualInputLength();
             }
+            if (positionToApply < 0) {
+                positionToApply = 0;
+            }
             el.setSelectionRange(positionToApply, positionToApply);
             this._position = null;
         };
@@ -1456,7 +1496,8 @@
                 }
                 if (e.keyCode === 8 && el.selectionStart !== 0) {
                     // If specialChars is false, (shouldn't ever happen) then set to the defaults
-                    this.specialCharacters = ((_a = this.specialCharacters) === null || _a === void 0 ? void 0 : _a.length) ? this.specialCharacters
+                    this.specialCharacters = ((_a = this.specialCharacters) === null || _a === void 0 ? void 0 : _a.length)
+                        ? this.specialCharacters
                         : this._config.specialCharacters;
                     if (this.prefix.length > 1 && el.selectionStart <= this.prefix.length) {
                         el.setSelectionRange(this.prefix.length, this.prefix.length);
@@ -1506,7 +1547,7 @@
         /** It writes the value in the input */
         MaskDirective.prototype.writeValue = function (inputValue) {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_b) {
+                return __generator(this, function (_c) {
                     if (typeof inputValue === 'object' && inputValue !== null && 'value' in inputValue) {
                         if ('disable' in inputValue) {
                             this.setDisabledState(Boolean(inputValue.disable));
@@ -1521,6 +1562,8 @@
                         inputValue = this.decimalMarker !== '.' ? inputValue.replace('.', this.decimalMarker) : inputValue;
                         this._maskService.isNumberValue = true;
                     }
+                    this._inputValue = inputValue;
+                    this._setMask();
                     if ((inputValue && this._maskService.maskExpression) ||
                         (this._maskService.maskExpression && (this._maskService.prefix || this._maskService.showMaskTyped))) {
                         // Let the service we know we are writing value so that triggering onChange function wont happen during applyMask
@@ -1566,11 +1609,6 @@
         MaskDirective.prototype.setDisabledState = function (isDisabled) {
             this._maskService.formElementProperty = ['disabled', isDisabled];
         };
-        MaskDirective.prototype.onModelChange = function (e) {
-            if (!e) {
-                this._maskService.actualValue = '';
-            }
-        };
         MaskDirective.prototype._repeatPatternSymbols = function (maskExp) {
             var _this = this;
             return ((maskExp.match(/{[0-9]+}/) &&
@@ -1581,8 +1619,8 @@
                     }
                     _this._end = index;
                     var repeatNumber = Number(maskExp.slice(_this._start + 1, _this._end));
-                    var repaceWith = new Array(repeatNumber + 1).join(maskExp[_this._start - 1]);
-                    return accum + repaceWith;
+                    var replaceWith = new Array(repeatNumber + 1).join(maskExp[_this._start - 1]);
+                    return accum + replaceWith;
                 }, '')) ||
                 maskExp);
         };
@@ -1596,7 +1634,7 @@
         };
         MaskDirective.prototype._validateTime = function (value) {
             var rowMaskLen = this._maskValue.split('').filter(function (s) { return s !== ':'; }).length;
-            if (value === null || value.length === 0) {
+            if (!value) {
                 return null; // Don't validate empty values to allow for optional form control
             }
             if ((+value[value.length - 1] === 0 && value.length < rowMaskLen) || value.length <= rowMaskLen - 2) {
@@ -1619,7 +1657,8 @@
             var _this = this;
             if (this._maskExpressionArray.length > 0) {
                 this._maskExpressionArray.some(function (mask) {
-                    var test = _this._maskService.removeMask(_this._inputValue).length <= _this._maskService.removeMask(mask).length;
+                    var _a, _b;
+                    var test = ((_a = _this._maskService.removeMask(_this._inputValue)) === null || _a === void 0 ? void 0 : _a.length) <= ((_b = _this._maskService.removeMask(mask)) === null || _b === void 0 ? void 0 : _b.length);
                     if (_this._inputValue && test) {
                         _this._maskValue = mask;
                         _this.maskExpression = mask;
@@ -1682,8 +1721,7 @@
         onInput: [{ type: core.HostListener, args: ['input', ['$event'],] }],
         onBlur: [{ type: core.HostListener, args: ['blur',] }],
         onFocus: [{ type: core.HostListener, args: ['click', ['$event'],] }],
-        onKeyDown: [{ type: core.HostListener, args: ['keydown', ['$event'],] }],
-        onModelChange: [{ type: core.HostListener, args: ['ngModelChange', ['$event'],] }]
+        onKeyDown: [{ type: core.HostListener, args: ['keydown', ['$event'],] }]
     };
 
     var MaskPipe = /** @class */ (function () {