ngx-mask 13.2.1 → 13.2.2

package/fesm2020/ngx-mask.mjs

@@ -96,6 +96,7 @@ class NgxMaskApplierService {
     constructor(_config) {
         this._config = _config;
         this._shift = new Set();
+        this.plusOnePosition = false;
         this.maskExpression = '';
         this.actualValue = '';
         this.showKeepCharacterExp = '';
@@ -222,7 +223,7 @@ class NgxMaskApplierService {
         let backspaceShift = false;
         let shift = 1;
         let stepBack = false;
-        if (inputValue.slice(0, this.prefix.length) === this.prefix && !this.showMaskTyped) {
+        if (inputValue.slice(0, this.prefix.length) === this.prefix) {
             // eslint-disable-next-line no-param-reassign
             inputValue = inputValue.slice(this.prefix.length, inputValue.length);
         }
@@ -306,24 +307,91 @@ class NgxMaskApplierService {
                 // eslint-disable-next-line no-param-reassign
                 inputValue = this._stripToDecimal(inputValue);
             }
-            // eslint-disable-next-line no-param-reassign
-            inputValue =
-                inputValue[0] === '-' && this.allowNegativeNumbers
+            const precision = this.getPrecision(maskExpression);
+            const decimalMarker = Array.isArray(this.decimalMarker)
+                ? "." /* DOT */
+                : this.decimalMarker;
+            if (precision === 0) {
+                // eslint-disable-next-line no-param-reassign
+                inputValue = this.allowNegativeNumbers
                     ? inputValue.length > 2 &&
-                        inputValue[1] === '0' &&
+                        inputValue[0] === "-" /* MINUS */ &&
+                        inputValue[1] === "0" /* NUMBER_ZERO */ &&
                         inputValue[2] !== this.thousandSeparator &&
-                        !this._compareOrIncludes(inputValue[2], this.decimalMarker, this.thousandSeparator) &&
-                        !backspaced
-                        ? inputValue.slice(0, inputValue.length - 1)
-                        : inputValue
+                        inputValue[2] !== "," /* COMMA */ &&
+                        inputValue[2] !== "." /* DOT */
+                        ? '-' + inputValue.slice(2, inputValue.length)
+                        : inputValue[0] === "0" /* NUMBER_ZERO */ &&
+                            inputValue.length > 1 &&
+                            inputValue[1] !== this.thousandSeparator &&
+                            inputValue[1] !== "," /* COMMA */ &&
+                            inputValue[1] !== "." /* DOT */
+                            ? inputValue.slice(1, inputValue.length)
+                            : inputValue
                     : inputValue.length > 1 &&
-                        inputValue[0] === '0' &&
+                        inputValue[0] === "0" /* NUMBER_ZERO */ &&
                         inputValue[1] !== this.thousandSeparator &&
-                        !this._compareOrIncludes(inputValue[1], this.decimalMarker, this.thousandSeparator) &&
-                        !backspaced
-                        ? inputValue.slice(0, inputValue.length - 1)
+                        inputValue[1] !== "," /* COMMA */ &&
+                        inputValue[1] !== "." /* DOT */
+                        ? inputValue.slice(1, inputValue.length)
                         : inputValue;
+            }
+            else {
+                // eslint-disable-next-line no-param-reassign
+                if (inputValue[0] === decimalMarker && inputValue.length > 1) {
+                    // eslint-disable-next-line no-param-reassign
+                    inputValue =
+                        "0" /* NUMBER_ZERO */ + inputValue.slice(0, inputValue.length + 1);
+                    this.plusOnePosition = true;
+                }
+                if (inputValue[0] === "0" /* NUMBER_ZERO */ &&
+                    inputValue[1] !== decimalMarker &&
+                    inputValue[1] !== this.thousandSeparator) {
+                    // eslint-disable-next-line no-param-reassign
+                    inputValue =
+                        inputValue.length > 1
+                            ? inputValue.slice(0, 1) +
+                                decimalMarker +
+                                inputValue.slice(1, inputValue.length + 1)
+                            : inputValue;
+                    this.plusOnePosition = true;
+                }
+                if (this.allowNegativeNumbers &&
+                    inputValue[0] === "-" /* MINUS */ &&
+                    (inputValue[1] === decimalMarker ||
+                        inputValue[1] === "0" /* NUMBER_ZERO */)) {
+                    // eslint-disable-next-line no-param-reassign
+                    inputValue =
+                        inputValue[1] === decimalMarker && inputValue.length > 2
+                            ? inputValue.slice(0, 1) +
+                                "0" /* NUMBER_ZERO */ +
+                                inputValue.slice(1, inputValue.length)
+                            : inputValue[1] === "0" /* NUMBER_ZERO */ &&
+                                inputValue.length > 2 &&
+                                inputValue[2] !== decimalMarker
+                                ? inputValue.slice(0, 2) +
+                                    decimalMarker +
+                                    inputValue.slice(2, inputValue.length)
+                                : inputValue;
+                    this.plusOnePosition = true;
+                }
+            }
             if (backspaced) {
+                if (inputValue[0] === "0" /* NUMBER_ZERO */ &&
+                    inputValue[1] === this.decimalMarker &&
+                    (inputValue[position] === "0" /* NUMBER_ZERO */ ||
+                        inputValue[position] === this.decimalMarker)) {
+                    // eslint-disable-next-line no-param-reassign
+                    inputValue = inputValue.slice(2, inputValue.length);
+                }
+                if (inputValue[0] === "-" /* MINUS */ &&
+                    inputValue[1] === "0" /* NUMBER_ZERO */ &&
+                    inputValue[2] === this.decimalMarker &&
+                    (inputValue[position] === "0" /* NUMBER_ZERO */ ||
+                        inputValue[position] === this.decimalMarker)) {
+                    // eslint-disable-next-line no-param-reassign
+                    inputValue = "-" /* MINUS */ + inputValue.slice(3, inputValue.length);
+                }
                 // eslint-disable-next-line no-param-reassign
                 inputValue = this._compareOrIncludes(inputValue[inputValue.length - 1], this.decimalMarker, this.thousandSeparator)
                     ? inputValue.slice(0, inputValue.length - 1)
@@ -343,13 +411,10 @@ class NgxMaskApplierService {
                 invalidChars = invalidChars.replace(this._charToRegExpExpression(this.decimalMarker), '');
             }
             const invalidCharRegexp = new RegExp('[' + invalidChars + ']');
-            if (inputValue.match(invalidCharRegexp) ||
-                (inputValue.length === 1 &&
-                    this._compareOrIncludes(inputValue, this.decimalMarker, this.thousandSeparator))) {
+            if (inputValue.match(invalidCharRegexp)) {
                 // eslint-disable-next-line no-param-reassign
                 inputValue = inputValue.substring(0, inputValue.length - 1);
             }
-            const precision = this.getPrecision(maskExpression);
             // eslint-disable-next-line no-param-reassign
             inputValue = this.checkInputPrecision(inputValue, precision, this.decimalMarker);
             const strForSep = inputValue.replace(new RegExp(thousandSeparatorCharEscaped, 'g'), '');
@@ -422,7 +487,7 @@ class NgxMaskApplierService {
                     if (maskExpression[cursor] === "H" /* HOURS */) {
                         if (this.apm ? Number(inputSymbol) > 9 : Number(inputSymbol) > 2) {
                             // eslint-disable-next-line no-param-reassign
-                            position = position + 1;
+                            position = !this.leadZeroDateTime ? position + 1 : position;
                             cursor += 1;
                             this._shiftStep(maskExpression, cursor, inputArray.length);
                             i--;
@@ -458,7 +523,7 @@ class NgxMaskApplierService {
                         maskExpression[cursor] === "s" /* SECOND */) {
                         if (Number(inputSymbol) > 5) {
                             // eslint-disable-next-line no-param-reassign
-                            position = position + 1;
+                            position = !this.leadZeroDateTime ? position + 1 : position;
                             cursor += 1;
                             this._shiftStep(maskExpression, cursor, inputArray.length);
                             i--;
@@ -496,7 +561,7 @@ class NgxMaskApplierService {
                                 : Number(inputValueSliceCursorPlusTwo) > daysCount ||
                                     this.specialCharacters.includes(inputValueCursorPlusOne))) {
                             // eslint-disable-next-line no-param-reassign
-                            position = position + 1;
+                            position = !this.leadZeroDateTime ? position + 1 : position;
                             cursor += 1;
                             this._shiftStep(maskExpression, cursor, inputArray.length);
                             i--;
@@ -552,7 +617,7 @@ class NgxMaskApplierService {
                             day2monthInput ||
                             (day2monthInputDot && !this.leadZeroDateTime)) {
                             // eslint-disable-next-line no-param-reassign
-                            position = position + 1;
+                            position = !this.leadZeroDateTime ? position + 1 : position;
                             cursor += 1;
                             this._shiftStep(maskExpression, cursor, inputArray.length);
                             i--;
@@ -647,7 +712,7 @@ class NgxMaskApplierService {
         if (backspaced) {
             onlySpecial = inputArray.every((char) => this.specialCharacters.includes(char));
         }
-        let res = `${this.prefix}${onlySpecial ? "" /* EMPTY_STRING */ : result}${this.suffix}`;
+        let res = `${this.prefix}${onlySpecial ? "" /* EMPTY_STRING */ : result}${this.showMaskTyped ? '' : this.suffix}`;
         if (result.length === 0) {
             res = !this.dropSpecialCharacters ? `${this.prefix}${result}` : `${result}`;
         }
@@ -792,7 +857,7 @@ class NgxMaskService extends NgxMaskApplierService {
         }
         if (!inputValue && this.showMaskTyped) {
             this.formControlResult(this.prefix);
-            return this.prefix + this.maskIsShown;
+            return this.prefix + this.maskIsShown + this.suffix;
         }
         const getSymbol = !!inputValue && typeof this.selStart === 'number'
             ? inputValue[this.selStart] ?? "" /* EMPTY_STRING */
@@ -838,6 +903,11 @@ class NgxMaskService extends NgxMaskApplierService {
         if (justPasted && (this.hiddenInput || !this.hiddenInput)) {
             newInputValue = inputValue;
         }
+        if (backspaced &&
+            this.specialCharacters.indexOf(this.maskExpression[position] ?? "" /* EMPTY_STRING */) !== -1 &&
+            this.showMaskTyped) {
+            newInputValue = this._currentValue;
+        }
         if (this.deletedSpecialCharacter && position) {
             if (this.specialCharacters.includes(this.actualValue.slice(position, position + 1))) {
                 // eslint-disable-next-line no-param-reassign
@@ -906,7 +976,7 @@ class NgxMaskService extends NgxMaskApplierService {
             return result;
         }
         const resLen = result.length;
-        const prefNmask = this.prefix + this.maskIsShown;
+        const prefNmask = this.prefix + this.maskIsShown + this.suffix;
         if (this.maskExpression.includes("H" /* HOURS */)) {
             const countSkipedSymbol = this._numberSkipedSymbols(result);
             return result + prefNmask.slice(resLen + countSkipedSymbol);
@@ -1219,11 +1289,17 @@ class NgxMaskService extends NgxMaskApplierService {
         return value ? value.replace(this.suffix, "" /* EMPTY_STRING */) : value;
     }
     _retrieveSeparatorValue(result) {
-        const specialCharacters = Array.isArray(this.dropSpecialCharacters)
+        let specialCharacters = Array.isArray(this.dropSpecialCharacters)
             ? this.specialCharacters.filter((v) => {
                 return this.dropSpecialCharacters.includes(v);
             })
             : this.specialCharacters;
+        if (!this.deletedSpecialCharacter &&
+            this._checkPatternForSpace() &&
+            result.includes(" " /* WHITE_SPACE */) &&
+            this.maskExpression.includes("*" /* SYMBOL_STAR */)) {
+            specialCharacters = specialCharacters.filter((char) => char !== " " /* WHITE_SPACE */);
+        }
         return this._removeMask(result, specialCharacters);
     }
     _regExpForRemove(specialCharactersForRemove) {
@@ -1262,6 +1338,20 @@ class NgxMaskService extends NgxMaskApplierService {
             return separatorValue;
         }
     }
+    _checkPatternForSpace() {
+        for (const key in this.patterns) {
+            // eslint-disable-next-line no-prototype-builtins
+            if (this.patterns[key] && this.patterns[key]?.hasOwnProperty('pattern')) {
+                const patternString = this.patterns[key]?.pattern.toString();
+                const pattern = this.patterns[key]?.pattern;
+                if (patternString?.includes(" " /* WHITE_SPACE */) &&
+                    pattern?.test(this.maskExpression)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
     // TODO should think about helpers or separting decimal precision to own property
     _retrieveSeparatorPrecision(maskExpretion) {
         const matcher = maskExpretion.match(new RegExp(`^separator\\.([^d]*)`));
@@ -1363,6 +1453,7 @@ class NgxMaskDirective {
         this.keepCharacterPositions = null;
         this.maskFilled = new EventEmitter();
         this._maskValue = '';
+        this._isFocused = false;
         this._position = null;
         this._maskExpressionArray = [];
         this._justPasted = false;
@@ -1380,13 +1471,6 @@ class NgxMaskDirective {
                 !maskExpression.firstChange) {
                 this._maskService.maskChanged = true;
             }
-            if (allowNegativeNumbers) {
-                this._maskService.allowNegativeNumbers = allowNegativeNumbers.currentValue;
-                if (this._maskService.allowNegativeNumbers) {
-                    this._maskService.specialCharacters =
-                        this._maskService.specialCharacters.filter((c) => c !== "-" /* MINUS */);
-                }
-            }
             if (maskExpression.currentValue &&
                 maskExpression.currentValue.split("||" /* OR */).length > 1) {
                 this._maskExpressionArray = maskExpression.currentValue
@@ -1410,6 +1494,12 @@ class NgxMaskDirective {
                 this._maskService.specialCharacters = specialCharacters.currentValue || [];
             }
         }
+        if (allowNegativeNumbers) {
+            this._maskService.allowNegativeNumbers = allowNegativeNumbers.currentValue;
+            if (this._maskService.allowNegativeNumbers) {
+                this._maskService.specialCharacters = this._maskService.specialCharacters.filter((c) => c !== "-" /* MINUS */);
+            }
+        }
         // Only overwrite the mask available patterns if a pattern has actually been passed in
         if (patterns && patterns.currentValue) {
             this._maskService.patterns = patterns.currentValue;
@@ -1437,6 +1527,13 @@ class NgxMaskDirective {
         }
         if (showMaskTyped) {
             this._maskService.showMaskTyped = showMaskTyped.currentValue;
+            if (showMaskTyped.previousValue === false &&
+                showMaskTyped.currentValue === true &&
+                this._isFocused) {
+                requestAnimationFrame(() => {
+                    this._maskService._elementRef?.nativeElement.click();
+                });
+            }
         }
         if (placeHolderCharacter) {
             this._maskService.placeHolderCharacter = placeHolderCharacter.currentValue;
@@ -1596,6 +1693,9 @@ class NgxMaskDirective {
     onPaste() {
         this._justPasted = true;
     }
+    onFocus() {
+        this._isFocused = true;
+    }
     onModelChange(value) {
         // on form reset we need to update the actualValue
         if ((value === "" /* EMPTY_STRING */ || value === null || value === undefined) &&
@@ -1696,13 +1796,33 @@ class NgxMaskDirective {
                             position = position + 1;
                         }
                         else if (checkSymbols) {
+                            if (el.value.length === 1 && position === 1) {
+                                this._maskService.actualValue =
+                                    this.prefix +
+                                        inputSymbol +
+                                        this._maskService.maskIsShown.slice(1, this._maskService.maskIsShown.length) +
+                                        this.suffix;
+                            }
+                            else {
+                                this._maskService.actualValue =
+                                    el.value.slice(0, position - 1) +
+                                        inputSymbol +
+                                        el.value
+                                            .slice(position + 1)
+                                            .split(this.suffix)
+                                            .join('') +
+                                        this.suffix;
+                            }
+                        }
+                        else if (this.prefix &&
+                            el.value.length === 1 &&
+                            position - prefixLength === 1 &&
+                            this._maskService._checkSymbolMask(el.value, this._maskService.maskExpression[position - 1 - prefixLength] ??
+                                "" /* EMPTY_STRING */)) {
                             this._maskService.actualValue =
-                                el.value.slice(0, position - 1) +
-                                    inputSymbol +
-                                    el.value
-                                        .slice(position + 1)
-                                        .split(this.suffix)
-                                        .join('') +
+                                this.prefix +
+                                    el.value +
+                                    this._maskService.maskIsShown.slice(1, this._maskService.maskIsShown.length) +
                                     this.suffix;
                         }
                     }
@@ -1722,6 +1842,13 @@ class NgxMaskDirective {
                             inputSymbol +
                             this._inputValue.slice(position + 1);
                 }
+                if (this._maskService.maskExpression === "d0/M0/0000" /* DAYS_MONTHS_YEARS */ &&
+                    this.leadZeroDateTime) {
+                    if ((position < 3 && Number(el.value) > 31 && Number(el.value) < 40) ||
+                        (position === 5 && Number(el.value.slice(3, 5)) > 12)) {
+                        position = position + 2;
+                    }
+                }
                 if (this._maskService.maskExpression === "Hh:m0:s0" /* HOURS_MINUTES_SECONDS */ &&
                     this.apm) {
                     if (this._justPasted && el.value.slice(0, 2) === "00" /* DOUBLE_ZERO */) {
@@ -1741,6 +1868,10 @@ class NgxMaskDirective {
                 if (this._getActiveElement() !== el) {
                     return;
                 }
+                if (this._maskService.plusOnePosition) {
+                    position = position + 1;
+                    this._maskService.plusOnePosition = false;
+                }
                 // update position after applyValueChanges to prevent cursor on wrong position when it has an array of maskExpression
                 if (this._maskExpressionArray.length) {
                     if (this._code === "Backspace" /* BACKSPACE */) {
@@ -1762,7 +1893,10 @@ class NgxMaskDirective {
                     : position +
                         (this._code === "Backspace" /* BACKSPACE */ && !backspaceShift ? 0 : caretShift);
                 if (positionToApply > this._getActualInputLength()) {
-                    positionToApply = this._getActualInputLength();
+                    positionToApply =
+                        el.value === this._maskService.decimalMarker && el.value.length === 1
+                            ? this._getActualInputLength() + 1
+                            : this._getActualInputLength();
                 }
                 if (positionToApply < 0) {
                     positionToApply = 0;
@@ -1775,6 +1909,10 @@ class NgxMaskDirective {
             }
         }
         else {
+            if (!this._maskValue) {
+                this.onChange(el.value);
+                return;
+            }
             this._maskService.applyValueChanges(el.value.length, this._justPasted, this._code === "Backspace" /* BACKSPACE */ || this._code === "Delete" /* DELETE */);
         }
     }
@@ -1810,6 +1948,7 @@ class NgxMaskDirective {
             }
             this._maskService.clearIfNotMatchFn();
         }
+        this._isFocused = false;
         this.onTouch();
     }
     onClick(e) {
@@ -1943,13 +2082,12 @@ class NgxMaskDirective {
         }
     }
     /** It writes the value in the input */
-    // public async writeValue(controlValue: unknown): Promise<void> {
     async writeValue(controlValue) {
         if (typeof controlValue === 'object' && controlValue !== null && 'value' in controlValue) {
             if ('disable' in controlValue) {
                 this.setDisabledState(Boolean(controlValue.disable));
             }
-            // // eslint-disable-next-line no-param-reassign
+            // eslint-disable-next-line no-param-reassign
             controlValue = controlValue.value;
         }
         if (controlValue !== null) {
@@ -1960,7 +2098,12 @@ class NgxMaskDirective {
         }
         if (typeof controlValue === 'string' ||
             typeof controlValue === 'number' ||
-            controlValue === null) {
+            controlValue === null ||
+            controlValue === undefined) {
+            if (controlValue === null || controlValue === undefined || controlValue === '') {
+                this._maskService._currentValue = '';
+                this._maskService._previousValue = '';
+            }
             // eslint-disable-next-line no-param-reassign
             let inputValue = controlValue;
             if (typeof inputValue === 'number' ||
@@ -2112,7 +2255,8 @@ class NgxMaskDirective {
                 }
             }
             else {
-                const check = this._inputValue
+                const check = this._maskService
+                    .removeMask(this._inputValue)
                     ?.split("" /* EMPTY_STRING */)
                     .every((character, index) => {
                     const indexMask = mask.charAt(index);
@@ -2127,7 +2271,7 @@ class NgxMaskDirective {
     }
 }
 NgxMaskDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: NgxMaskDirective, deps: [{ token: DOCUMENT }, { token: NGX_MASK_CONFIG }, { token: NgxMaskService }], target: i0.ɵɵFactoryTarget.Directive });
-NgxMaskDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.3.12", type: NgxMaskDirective, selector: "input[mask], textarea[mask]", inputs: { maskExpression: ["mask", "maskExpression"], specialCharacters: "specialCharacters", patterns: "patterns", prefix: "prefix", suffix: "suffix", thousandSeparator: "thousandSeparator", decimalMarker: "decimalMarker", dropSpecialCharacters: "dropSpecialCharacters", hiddenInput: "hiddenInput", showMaskTyped: "showMaskTyped", placeHolderCharacter: "placeHolderCharacter", shownMaskExpression: "shownMaskExpression", showTemplate: "showTemplate", clearIfNotMatch: "clearIfNotMatch", validation: "validation", separatorLimit: "separatorLimit", allowNegativeNumbers: "allowNegativeNumbers", leadZeroDateTime: "leadZeroDateTime", leadZero: "leadZero", triggerOnMaskChange: "triggerOnMaskChange", apm: "apm", inputTransformFn: "inputTransformFn", outputTransformFn: "outputTransformFn", keepCharacterPositions: "keepCharacterPositions" }, outputs: { maskFilled: "maskFilled" }, host: { listeners: { "paste": "onPaste()", "ngModelChange": "onModelChange($event)", "input": "onInput($event)", "compositionstart": "onCompositionStart($event)", "compositionend": "onCompositionEnd($event)", "blur": "onBlur($event)", "click": "onClick($event)", "keydown": "onKeyDown($event)" } }, providers: [
+NgxMaskDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.3.12", type: NgxMaskDirective, selector: "input[mask], textarea[mask]", inputs: { maskExpression: ["mask", "maskExpression"], specialCharacters: "specialCharacters", patterns: "patterns", prefix: "prefix", suffix: "suffix", thousandSeparator: "thousandSeparator", decimalMarker: "decimalMarker", dropSpecialCharacters: "dropSpecialCharacters", hiddenInput: "hiddenInput", showMaskTyped: "showMaskTyped", placeHolderCharacter: "placeHolderCharacter", shownMaskExpression: "shownMaskExpression", showTemplate: "showTemplate", clearIfNotMatch: "clearIfNotMatch", validation: "validation", separatorLimit: "separatorLimit", allowNegativeNumbers: "allowNegativeNumbers", leadZeroDateTime: "leadZeroDateTime", leadZero: "leadZero", triggerOnMaskChange: "triggerOnMaskChange", apm: "apm", inputTransformFn: "inputTransformFn", outputTransformFn: "outputTransformFn", keepCharacterPositions: "keepCharacterPositions" }, outputs: { maskFilled: "maskFilled" }, host: { listeners: { "paste": "onPaste()", "focus": "onFocus($event)", "ngModelChange": "onModelChange($event)", "input": "onInput($event)", "compositionstart": "onCompositionStart($event)", "compositionend": "onCompositionEnd($event)", "blur": "onBlur($event)", "click": "onClick($event)", "keydown": "onKeyDown($event)" } }, providers: [
         {
             provide: NG_VALUE_ACCESSOR,
             useExisting: forwardRef(() => NgxMaskDirective),
@@ -2219,6 +2363,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
             }], onPaste: [{
                 type: HostListener,
                 args: ['paste']
+            }], onFocus: [{
+                type: HostListener,
+                args: ['focus', ['$event']]
             }], onModelChange: [{
                 type: HostListener,
                 args: ['ngModelChange', ['$event']]
@@ -2312,6 +2459,9 @@ class NgxMaskPipe {
             }
             this._maskService.isNumberValue = true;
         }
+        if (value === null || value === undefined) {
+            return this._maskService.applyMask('', mask);
+        }
         return this._maskService.applyMask(`${value}`, mask);
     }
     _setMask(value) {