ngx-mask 14.2.1 → 14.2.3

package/fesm2020/ngx-mask.mjs

@@ -266,9 +266,10 @@ class MaskApplierService {
             inputValue =
                 inputValue.length > 1 &&
                     inputValue[0] === '0' &&
+                    inputValue[1] !== this.thousandSeparator &&
                     !this._compareOrIncludes(inputValue[1], this.decimalMarker, this.thousandSeparator) &&
                     !backspaced
-                    ? inputValue.slice(1, inputValue.length)
+                    ? inputValue.slice(0, inputValue.length - 1)
                     : inputValue;
             if (backspaced) {
                 // eslint-disable-next-line no-param-reassign
@@ -549,10 +550,13 @@ class MaskApplierService {
         return str
             .split('')
             .filter((i, idx) => {
+            const isDecimalMarker = typeof this.decimalMarker === 'string'
+                ? i === this.decimalMarker
+                : // TODO (inepipenko) use utility type
+                    this.decimalMarker.includes(i);
             return (i.match('^-?\\d') ||
-                i.match('\\s') ||
-                i === '.' ||
-                i === ',' ||
+                i === this.thousandSeparator ||
+                isDecimalMarker ||
                 (i === '-' && idx === 0 && this.allowNegativeNumbers));
         })
             .join('');
@@ -660,6 +664,10 @@ class MaskService extends MaskApplierService {
                     ? this.shiftTypedSymbols(actualResult.join(''))
                     : inputValue;
         }
+        if (this.showMaskTyped) {
+            // eslint-disable-next-line no-param-reassign
+            inputValue = this.removeMask(inputValue);
+        }
         newInputValue = Boolean(newInputValue) && newInputValue.length ? newInputValue : inputValue;
         const result = super.applyMask(newInputValue, maskExpression, position, justPasted, backspaced, cb);
         this.actualValue = this.getActualValue(result);
@@ -1390,8 +1398,7 @@ class MaskDirective {
         this._inputValue = inputValue;
     }
     registerOnChange(fn) {
-        this.onChange = fn;
-        this._maskService.onChange = this.onChange;
+        this._maskService.onChange = this.onChange = fn;
     }
     registerOnTouched(fn) {
         this.onTouch = fn;