ngx-mask - npm Package Compare versions

Comparing version 7.4.0 to 7.4.1

bundles/ngx-mask.umd.js

@@ -671,2 +671,16 @@ (function (global, factory) {
                 var result = _super.prototype.applyMask.call(this, inputValue, maskExpression, position, cb);
+                if (this.maskExpression === 'dot_separator.2' && this.dropSpecialCharacters === true) {
+                    this.maskSpecialCharacters = this.maskSpecialCharacters.filter(( /**
+                     * @param {?} item
+                     * @return {?}
+                     */function (item) { return item !== ','; }));
+                }
+                if ((this.maskExpression === 'coma_separator.2' && this.dropSpecialCharacters === true)) {
+                    this.maskSpecialCharacters = this.maskSpecialCharacters.filter(( /**
+                     * @param {?} item
+                     * @return {?}
+                     */function (item) { return item !== '.'; }));
+                }
+                // tslint:disable-next-line:no-console
+                console.table(this.maskSpecialCharacters, this.dropSpecialCharacters, this.maskExpression);
                 Array.isArray(this.dropSpecialCharacters)
@@ -673,0 +687,0 @@ ? this.onChange(this._removeMask(this._removeSufix(this._removePrefix(result)), this.dropSpecialCharacters))

bundles/ngx-mask.umd.min.js

@@ -1,2 +0,2 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("@angular/forms"),require("@angular/common"),require("@angular/core")):"function"==typeof define&&define.amd?define("ngx-mask",["exports","@angular/forms","@angular/common","@angular/core"],t):t(e["ngx-mask"]={},e.ng.forms,e.ng.common,e.ng.core)}(this,function(e,t,r,s){"use strict";var n=new s.InjectionToken("config"),i=new s.InjectionToken("NEW_CONFIG"),a=new s.InjectionToken("INITIAL_CONFIG"),o={sufix:"",prefix:"",clearIfNotMatch:!1,showTemplate:!1,showMaskTyped:!1,dropSpecialCharacters:!0,shownMaskExpression:"",specialCharacters:["-","/","(",")",".",":"," ","+",",","@","[","]",'"',"'"],patterns:{0:{pattern:new RegExp("\\d")},9:{pattern:new RegExp("\\d"),optional:!0},A:{pattern:new RegExp("[a-zA-Z0-9]")},S:{pattern:new RegExp("[a-zA-Z]")},d:{pattern:new RegExp("\\d")},m:{pattern:new RegExp("\\d")},H:{pattern:new RegExp("\\d")},h:{pattern:new RegExp("\\d")},s:{pattern:new RegExp("\\d")}}},c=function(e,t){return(c=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var r in t)t.hasOwnProperty(r)&&(e[r]=t[r])})(e,t)};var h=function(){return(h=Object.assign||function(e){for(var t,r=1,i=arguments.length;r<i;r++)for(var s in t=arguments[r])Object.prototype.hasOwnProperty.call(t,s)&&(e[s]=t[s]);return e}).apply(this,arguments)};function p(i,s){var n,a,o,e,c={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return e={next:t(0),"throw":t(1),"return":t(2)},"function"==typeof Symbol&&(e[Symbol.iterator]=function(){return this}),e;function t(t){return function(e){return function r(e){if(n)throw new TypeError("Generator is already executing.");for(;c;)try{if(n=1,a&&(o=2&e[0]?a["return"]:e[0]?a["throw"]||((o=a["return"])&&o.call(a),0):a.next)&&!(o=o.call(a,e[1])).done)return o;switch(a=0,o&&(e=[2&e[0],o.value]),e[0]){case 0:case 1:o=e;break;case 4:return c.label++,{value:e[1],done:!1};case 5:c.label++,a=e[1],e=[0];continue;case 7:e=c.ops.pop(),c.trys.pop();continue;default:if(!(o=0<(o=c.trys).length&&o[o.length-1])&&(6===e[0]||2===e[0])){c=0;continue}if(3===e[0]&&(!o||e[1]>o[0]&&e[1]<o[3])){c.label=e[1];break}if(6===e[0]&&c.label<o[1]){c.label=o[1],o=e;break}if(o&&c.label<o[2]){c.label=o[2],c.ops.push(e);break}o[2]&&c.ops.pop(),c.trys.pop();continue}e=s.call(i,c)}catch(t){e=[6,t],a=0}finally{n=o=0}if(5&e[0])throw e[1];return{value:e[0]?e[1]:void 0,done:!0}}([t,e])}}}function l(e,t){var r="function"==typeof Symbol&&e[Symbol.iterator];if(!r)return e;var i,s,n=r.call(e),a=[];try{for(;(void 0===t||0<t--)&&!(i=n.next()).done;)a.push(i.value)}catch(o){s={error:o}}finally{try{i&&!i.done&&(r=n["return"])&&r.call(n)}finally{if(s)throw s.error}}return a}var u=function(){function e(e){this._config=e,this.maskExpression="",this.shownMaskExpression="",this.separator=function(e,t,r,i){for(var s=(e+="").split(r),n=1<s.length?""+r+s[1]:"",a=s[0],o=/(\d+)(\d{3})/;o.test(a);)a=a.replace(o,"$1"+t+"$2");return i===undefined?a+n:0===i?a:a+n.substr(0,i+1)},this.percentage=function(e){return 0<=Number(e)&&Number(e)<=100},this.getPrecision=function(e){var t=e.split(".");return 1<t.length?Number(t[t.length-1]):Infinity},this.checkInputPrecision=function(e,t,r){if(t<Infinity){var i=void 0;i="."===r?new RegExp("\\.\\d{"+t+"}.*$"):new RegExp(",\\d{"+t+"}.*$");var s=e.match(i);s&&s[0].length-1>t?e=e.substring(0,e.length-1):0===t&&e.endsWith(r)&&(e=e.substring(0,e.length-1))}return e},this._shift=new Set,this.maskSpecialCharacters=this._config.specialCharacters,this.maskAvailablePatterns=this._config.patterns,this.clearIfNotMatch=this._config.clearIfNotMatch,this.dropSpecialCharacters=this._config.dropSpecialCharacters,this.maskSpecialCharacters=this._config.specialCharacters,this.maskAvailablePatterns=this._config.patterns,this.prefix=this._config.prefix,this.sufix=this._config.sufix}return e.prototype.applyMaskWithPattern=function(e,t){var r=l(t,2),i=r[0],s=r[1];return this.customPattern=s,this.applyMask(e,i)},e.prototype.applyMask=function(e,t,r,i){if(void 0===r&&(r=0),void 0===i&&(i=function(){}),e===undefined||null===e||t===undefined)return"";var s=0,n="",a=!1;e.slice(0,this.prefix.length)===this.prefix&&(e=e.slice(this.prefix.length,e.length));var o=e.toString().split("");if("percent"===t)(e.match("[a-z]|[A-Z]")||e.match(/[-!$%^&*()_+|~=`{}\[\]:";'<>?,\/]/))&&(e=e.substring(0,e.length-1)),n=this.percentage(e)?e:e.substring(0,e.length-1);else if("separator"===t||"dot_separator"===t||t.startsWith("dot_separator")||"coma_separator"===t||t.startsWith("coma_separator")){(e.match("[a-z]|[A-Z]")||e.match(/[@#!$%^&*()_+|~=`{}\[\]:";<>?\/]/))&&(e=e.substring(0,e.length-1));var c=this.getPrecision(t),h=void 0;"separator"===t?(e.includes(",")&&e.endsWith(",")&&e.indexOf(",")!==e.lastIndexOf(",")&&(e=e.substring(0,e.length-1)),(e.match("[a-z]|[A-Z]")||e.match(/[@#!$%^&*()_+|~=`{}\[\]:.";<>?\/]/))&&(e=e.substring(0,e.length-1)),h=e.replace(/\s/g,""),n=this.separator(h," ",".",c)):"dot_separator"===t||t.startsWith("dot_separator")?((e.match("[a-z]|[A-Z]")||e.match(/[@#!$%^&*()_+|~=`{}\[\]:\s";<>?\/]/))&&(e=e.substring(0,e.length-1)),h=(e=this.checkInputPrecision(e,c,",")).replace(/\./g,""),n=this.separator(h,".",",",c)):("coma_separator"===t||t.startsWith("coma_separator"))&&(h=(e=this.checkInputPrecision(e,c,".")).replace(/\,/g,""),n=this.separator(h,",",".",c)),s=r=n.length+1;var p=/\*|\?/g.test(t.slice(0,s))?o.length:s;this._shift.add(p+this.prefix.length||0)}else for(var l=0,u=o[0];l<o.length&&s!==t.length;u=o[++l])if(this._checkSymbolMask(u,t[s])&&"?"===t[s+1])n+=u,s+=2;else if("*"===t[s+1]&&a&&this._checkSymbolMask(u,t[s+2]))n+=u,s+=3,a=!1;else if(this._checkSymbolMask(u,t[s])&&"*"===t[s+1])n+=u,a=!0;else if("?"===t[s+1]&&this._checkSymbolMask(u,t[s+2]))n+=u,s+=3;else if(this._checkSymbolMask(u,t[s])){if("H"===t[s]&&2<Number(u)){n+=0,s+=1;p=/\*|\?/g.test(t.slice(0,s))?o.length:s;this._shift.add(p+this.prefix.length||0),l--;continue}if("h"===t[s]&&"2"===n&&3<Number(u))continue;if("m"===t[s]&&5<Number(u)){n+=0,s+=1;p=/\*|\?/g.test(t.slice(0,s))?o.length:s;this._shift.add(p+this.prefix.length||0),l--;continue}if("s"===t[s]&&5<Number(u)){n+=0,s+=1;p=/\*|\?/g.test(t.slice(0,s))?o.length:s;this._shift.add(p+this.prefix.length||0),l--;continue}if("d"===t[s]&&3<Number(u)){n+=0,s+=1;p=/\*|\?/g.test(t.slice(0,s))?o.length:s;this._shift.add(p+this.prefix.length||0),l--;continue}if("d"===t[s-1]&&31<Number(e.slice(s-1,s+1)))continue;if("m"===t[s]&&1<Number(u)){n+=0,s+=1;p=/\*|\?/g.test(t.slice(0,s))?o.length:s;this._shift.add(p+this.prefix.length||0),l--;continue}if("m"===t[s-1]&&12<Number(e.slice(s-1,s+1)))continue;n+=u,s++}else if(-1!==this.maskSpecialCharacters.indexOf(t[s])){n+=t[s],s++;p=/\*|\?/g.test(t.slice(0,s))?o.length:s;this._shift.add(p+this.prefix.length||0),l--}else-1<this.maskSpecialCharacters.indexOf(u)&&this.maskAvailablePatterns[t[s]]&&this.maskAvailablePatterns[t[s]].optional?(s++,l--):"*"===this.maskExpression[s+1]&&this._findSpecialChar(this.maskExpression[s+2])&&this._findSpecialChar(u)===this.maskExpression[s+2]&&a&&(s+=3,n+=u);n.length+1===t.length&&-1!==this.maskSpecialCharacters.indexOf(t[t.length-1])&&(n+=t[t.length-1]);for(var f=1,m=r+1;this._shift.has(m);)f++,m++;i(this._shift.has(r)?f:0);var d=""+this.prefix+n;return d=this.sufix?""+this.prefix+n+this.sufix:""+this.prefix+n,0===n.length&&(d=""+this.prefix+n),d},e.prototype._findSpecialChar=function(t){return this.maskSpecialCharacters.find(function(e){return e===t})},e.prototype._checkSymbolMask=function(e,t){return this.maskAvailablePatterns=this.customPattern?this.customPattern:this.maskAvailablePatterns,this.maskAvailablePatterns[t]&&this.maskAvailablePatterns[t].pattern&&this.maskAvailablePatterns[t].pattern.test(e)},e.decorators=[{type:s.Injectable}],e.ctorParameters=function(){return[{type:undefined,decorators:[{type:s.Inject,args:[n]}]}]},e}(),f=function(a){function e(e,t,r,i){var s=a.call(this,t)||this;return s.document=e,s._config=t,s._elementRef=r,s._renderer=i,s.maskExpression="",s.isNumberValue=!1,s.showMaskTyped=!1,s.maskIsShown="",s.onChange=function(e){},s.onTouch=function(){},s._formElement=s._elementRef.nativeElement,s}return function i(e,t){function r(){this.constructor=e}c(e,t),e.prototype=null===t?Object.create(t):(r.prototype=t.prototype,new r)}(e,a),e.prototype.applyMask=function(e,t,r,i){if(void 0===r&&(r=0),void 0===i&&(i=function(){}),this.maskIsShown=this.showMaskTyped?this.showMaskInInput():"",!e&&this.showMaskTyped)return this.prefix+this.maskIsShown;var s=a.prototype.applyMask.call(this,e,t,r,i);Array.isArray(this.dropSpecialCharacters)?this.onChange(this._removeMask(this._removeSufix(this._removePrefix(s)),this.dropSpecialCharacters)):!0===this.dropSpecialCharacters?this.onChange(this.isNumberValue?Number(this._removeMask(this._removeSufix(this._removePrefix(s)),this.maskSpecialCharacters)):this._removeMask(this._removeSufix(this._removePrefix(s)),this.maskSpecialCharacters)):this.onChange(this._removeSufix(this._removePrefix(s)));if(!this.showMaskTyped)return s;var n=s.length;return s+(this.prefix+this.maskIsShown).slice(n)},e.prototype.applyValueChanges=function(e,t){void 0===e&&(e=0),void 0===t&&(t=function(){});var r=this.applyMask(this._formElement.value,this.maskExpression,e,t);this._formElement.value=r,this._formElement!==this.document.activeElement&&this.clearIfNotMatchFn()},e.prototype.showMaskInInput=function(){if(this.showMaskTyped&&this.shownMaskExpression){if(this.maskExpression.length!==this.shownMaskExpression.length)throw new Error("Mask expression must match mask placeholder length");return this.shownMaskExpression}return this.showMaskTyped?this.maskExpression.replace(/\w/g,"_"):""},e.prototype.clearIfNotMatchFn=function(){!0===this.clearIfNotMatch&&this.maskExpression.length!==this._formElement.value.length&&(this.formElementProperty=["value",""],this.applyMask(this._formElement.value,this.maskExpression))},Object.defineProperty(e.prototype,"formElementProperty",{set:function(e){var t=l(e,2),r=t[0],i=t[1];this._renderer.setProperty(this._formElement,r,i)},enumerable:!0,configurable:!0}),e.prototype._removeMask=function(e,t){return e?e.replace(this._regExpForRemove(t),""):e},e.prototype._removePrefix=function(e){return this.prefix&&e?e.replace(this.prefix,""):e},e.prototype._removeSufix=function(e){return this.sufix&&e?e.replace(this.sufix,""):e},e.prototype._regExpForRemove=function(e){return new RegExp(e.map(function(e){return"\\"+e}).join("|"),"gi")},e.decorators=[{type:s.Injectable}],e.ctorParameters=function(){return[{type:undefined,decorators:[{type:s.Inject,args:[r.DOCUMENT]}]},{type:undefined,decorators:[{type:s.Inject,args:[n]}]},{type:s.ElementRef},{type:s.Renderer2}]},e}(u),m=function(){function e(e,t){this.document=e,this._maskService=t,this._position=null,this.onChange=function(e){},this.onTouch=function(){}}return Object.defineProperty(e.prototype,"maskExpression",{set:function(e){this._maskValue=e||"",this._maskValue&&(this._maskService.maskExpression=this._repeatPatternSymbols(this._maskValue),this._maskService.formElementProperty=["value",this._maskService.applyMask(this._inputValue,this._maskService.maskExpression)])},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"specialCharacters",{set:function(e){e&&Array.isArray(e)&&(!Array.isArray(e)||e.length)&&(this._maskService.maskSpecialCharacters=e)},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"patterns",{set:function(e){e&&(this._maskService.maskAvailablePatterns=e)},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"prefix",{set:function(e){e&&(this._maskService.prefix=e)},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"sufix",{set:function(e){e&&(this._maskService.sufix=e)},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"dropSpecialCharacters",{set:function(e){this._maskService.dropSpecialCharacters=e},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"showMaskTyped",{set:function(e){e&&(this._maskService.showMaskTyped=e)},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"shownMaskExpression",{set:function(e){e&&(this._maskService.shownMaskExpression=e)},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"showTemplate",{set:function(e){this._maskService.showTemplate=e},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"clearIfNotMatch",{set:function(e){this._maskService.clearIfNotMatch=e},enumerable:!0,configurable:!0}),e.prototype.onInput=function(e){var t=e.target;if(this._inputValue=t.value,this._maskValue){var r=1===t.selectionStart?t.selectionStart+this._maskService.prefix.length:t.selectionStart,i=0;this._maskService.applyValueChanges(r,function(e){return i=e}),this.document.activeElement===t&&(t.selectionStart=t.selectionEnd=null!==this._position?this._position:r+("deleteContentBackward"===e.inputType?0:i),this._position=null)}else this.onChange(t.value)},e.prototype.onBlur=function(){this._maskService.clearIfNotMatchFn(),this.onTouch()},e.prototype.onFocus=function(e){var t=e.target;null!==t&&null!==t.selectionStart&&t.selectionStart===t.selectionEnd&&t.selectionStart>this._maskService.prefix.length&&38!==e.keyCode||(this._maskService.showMaskTyped&&(this._maskService.maskIsShown=this._maskService.showMaskInInput()),t.value=t.value&&t.value!==this._maskService.prefix?t.value:this._maskService.prefix+this._maskService.maskIsShown,(t.selectionStart||t.selectionEnd)<=this._maskService.prefix.length&&(t.selectionStart=this._maskService.prefix.length))},e.prototype.a=function(e){var t=e.target;38===e.keyCode&&e.preventDefault(),37!==e.keyCode&&8!==e.keyCode||(t.selectionStart<=this._maskService.prefix.length&&t.selectionEnd<=this._maskService.prefix.length&&e.preventDefault(),this.onFocus(e),8===e.keyCode&&0===t.selectionStart&&t.selectionEnd===t.value.length&&(t.value=this._maskService.prefix,this._position=this._maskService.prefix?this._maskService.prefix.length:1,this.onInput(e)))},e.prototype.onPaste=function(){this._position=Number.MAX_SAFE_INTEGER},e.prototype.writeValue=function(t){return function e(t,a,o,c){return new(o||(o=Promise))(function(e,r){function i(e){try{n(c.next(e))}catch(t){r(t)}}function s(e){try{n(c["throw"](e))}catch(t){r(t)}}function n(t){t.done?e(t.value):new o(function(e){e(t.value)}).then(i,s)}n((c=c.apply(t,a||[])).next())})}(this,void 0,void 0,function(){return p(this,function(e){return t===undefined&&(t=""),"number"==typeof t&&(t=String(t),this._maskService.isNumberValue=!0),t&&this._maskService.maskExpression||this._maskService.maskExpression&&(this._maskService.prefix||this._maskService.showMaskTyped)?this._maskService.formElementProperty=["value",this._maskService.applyMask(t,this._maskService.maskExpression)]:this._maskService.formElementProperty=["value",t],this._inputValue=t,[2]})})},e.prototype.registerOnChange=function(e){this.onChange=e,this._maskService.onChange=this.onChange},e.prototype.registerOnTouched=function(e){this.onTouch=e},e.prototype.setDisabledState=function(e){this._maskService.formElementProperty=["disabled",e]},e.prototype._repeatPatternSymbols=function(s){var n=this;return s.match(/{[0-9]+}/)&&s.split("").reduce(function(e,t,r){if(n._start="{"===t?r:n._start,"}"!==t)return n._maskService._findSpecialChar(t)?e+t:e;n._end=r;var i=Number(s.slice(n._start+1,n._end));return e+new Array(i+1).join(s[n._start-1])},"")||s},e.decorators=[{type:s.Directive,args:[{selector:"[mask]",providers:[{provide:t.NG_VALUE_ACCESSOR,useExisting:s.forwardRef(function(){return e}),multi:!0},f]}]}],e.ctorParameters=function(){return[{type:undefined,decorators:[{type:s.Inject,args:[r.DOCUMENT]}]},{type:f}]},e.propDecorators={maskExpression:[{type:s.Input,args:["mask"]}],specialCharacters:[{type:s.Input}],patterns:[{type:s.Input}],prefix:[{type:s.Input}],sufix:[{type:s.Input}],dropSpecialCharacters:[{type:s.Input}],showMaskTyped:[{type:s.Input}],shownMaskExpression:[{type:s.Input}],showTemplate:[{type:s.Input}],clearIfNotMatch:[{type:s.Input}],onInput:[{type:s.HostListener,args:["input",["$event"]]}],onBlur:[{type:s.HostListener,args:["blur"]}],onFocus:[{type:s.HostListener,args:["click",["$event"]]}],a:[{type:s.HostListener,args:["keydown",["$event"]]}],onPaste:[{type:s.HostListener,args:["paste"]}]},e}(),d=function(){function e(e){this._maskService=e}return e.prototype.transform=function(e,t){return e?"string"==typeof t?this._maskService.applyMask(""+e,t):this._maskService.applyMaskWithPattern(""+e,t):""},e.decorators=[{type:s.Pipe,args:[{name:"mask",pure:!0}]}],e.ctorParameters=function(){return[{type:u}]},e}(),y=function(){function t(){}return t.forRoot=function(e){return{ngModule:t,providers:[{provide:i,useValue:e},{provide:a,useValue:o},{provide:n,useFactory:k,deps:[a,i]}]}},t.forChild=function(e){return{ngModule:t}},t.decorators=[{type:s.NgModule,args:[{providers:[u],exports:[m,d],declarations:[m,d]}]}],t}();function k(e,t){return"function"==typeof t?t():h({},e,t)}e.config=n,e.NEW_CONFIG=i,e.INITIAL_CONFIG=a,e.initialConfig=o,e.MaskDirective=m,e.MaskService=f,e._configFactory=k,e.NgxMaskModule=y,e.MaskPipe=d,e.ɵa=u,Object.defineProperty(e,"__esModule",{value:!0})});
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("@angular/forms"),require("@angular/common"),require("@angular/core")):"function"==typeof define&&define.amd?define("ngx-mask",["exports","@angular/forms","@angular/common","@angular/core"],t):t(e["ngx-mask"]={},e.ng.forms,e.ng.common,e.ng.core)}(this,function(e,t,r,i){"use strict";var n=new i.InjectionToken("config"),s=new i.InjectionToken("NEW_CONFIG"),a=new i.InjectionToken("INITIAL_CONFIG"),o={sufix:"",prefix:"",clearIfNotMatch:!1,showTemplate:!1,showMaskTyped:!1,dropSpecialCharacters:!0,shownMaskExpression:"",specialCharacters:["-","/","(",")",".",":"," ","+",",","@","[","]",'"',"'"],patterns:{0:{pattern:new RegExp("\\d")},9:{pattern:new RegExp("\\d"),optional:!0},A:{pattern:new RegExp("[a-zA-Z0-9]")},S:{pattern:new RegExp("[a-zA-Z]")},d:{pattern:new RegExp("\\d")},m:{pattern:new RegExp("\\d")},H:{pattern:new RegExp("\\d")},h:{pattern:new RegExp("\\d")},s:{pattern:new RegExp("\\d")}}},c=function(e,t){return(c=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var r in t)t.hasOwnProperty(r)&&(e[r]=t[r])})(e,t)};var h=function(){return(h=Object.assign||function(e){for(var t,r=1,s=arguments.length;r<s;r++)for(var i in t=arguments[r])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)};function p(s,i){var n,a,o,e,c={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return e={next:t(0),"throw":t(1),"return":t(2)},"function"==typeof Symbol&&(e[Symbol.iterator]=function(){return this}),e;function t(t){return function(e){return function r(e){if(n)throw new TypeError("Generator is already executing.");for(;c;)try{if(n=1,a&&(o=2&e[0]?a["return"]:e[0]?a["throw"]||((o=a["return"])&&o.call(a),0):a.next)&&!(o=o.call(a,e[1])).done)return o;switch(a=0,o&&(e=[2&e[0],o.value]),e[0]){case 0:case 1:o=e;break;case 4:return c.label++,{value:e[1],done:!1};case 5:c.label++,a=e[1],e=[0];continue;case 7:e=c.ops.pop(),c.trys.pop();continue;default:if(!(o=0<(o=c.trys).length&&o[o.length-1])&&(6===e[0]||2===e[0])){c=0;continue}if(3===e[0]&&(!o||e[1]>o[0]&&e[1]<o[3])){c.label=e[1];break}if(6===e[0]&&c.label<o[1]){c.label=o[1],o=e;break}if(o&&c.label<o[2]){c.label=o[2],c.ops.push(e);break}o[2]&&c.ops.pop(),c.trys.pop();continue}e=i.call(s,c)}catch(t){e=[6,t],a=0}finally{n=o=0}if(5&e[0])throw e[1];return{value:e[0]?e[1]:void 0,done:!0}}([t,e])}}}function l(e,t){var r="function"==typeof Symbol&&e[Symbol.iterator];if(!r)return e;var s,i,n=r.call(e),a=[];try{for(;(void 0===t||0<t--)&&!(s=n.next()).done;)a.push(s.value)}catch(o){i={error:o}}finally{try{s&&!s.done&&(r=n["return"])&&r.call(n)}finally{if(i)throw i.error}}return a}var u=function(){function e(e){this._config=e,this.maskExpression="",this.shownMaskExpression="",this.separator=function(e,t,r,s){for(var i=(e+="").split(r),n=1<i.length?""+r+i[1]:"",a=i[0],o=/(\d+)(\d{3})/;o.test(a);)a=a.replace(o,"$1"+t+"$2");return s===undefined?a+n:0===s?a:a+n.substr(0,s+1)},this.percentage=function(e){return 0<=Number(e)&&Number(e)<=100},this.getPrecision=function(e){var t=e.split(".");return 1<t.length?Number(t[t.length-1]):Infinity},this.checkInputPrecision=function(e,t,r){if(t<Infinity){var s=void 0;s="."===r?new RegExp("\\.\\d{"+t+"}.*$"):new RegExp(",\\d{"+t+"}.*$");var i=e.match(s);i&&i[0].length-1>t?e=e.substring(0,e.length-1):0===t&&e.endsWith(r)&&(e=e.substring(0,e.length-1))}return e},this._shift=new Set,this.maskSpecialCharacters=this._config.specialCharacters,this.maskAvailablePatterns=this._config.patterns,this.clearIfNotMatch=this._config.clearIfNotMatch,this.dropSpecialCharacters=this._config.dropSpecialCharacters,this.maskSpecialCharacters=this._config.specialCharacters,this.maskAvailablePatterns=this._config.patterns,this.prefix=this._config.prefix,this.sufix=this._config.sufix}return e.prototype.applyMaskWithPattern=function(e,t){var r=l(t,2),s=r[0],i=r[1];return this.customPattern=i,this.applyMask(e,s)},e.prototype.applyMask=function(e,t,r,s){if(void 0===r&&(r=0),void 0===s&&(s=function(){}),e===undefined||null===e||t===undefined)return"";var i=0,n="",a=!1;e.slice(0,this.prefix.length)===this.prefix&&(e=e.slice(this.prefix.length,e.length));var o=e.toString().split("");if("percent"===t)(e.match("[a-z]|[A-Z]")||e.match(/[-!$%^&*()_+|~=`{}\[\]:";'<>?,\/]/))&&(e=e.substring(0,e.length-1)),n=this.percentage(e)?e:e.substring(0,e.length-1);else if("separator"===t||"dot_separator"===t||t.startsWith("dot_separator")||"coma_separator"===t||t.startsWith("coma_separator")){(e.match("[a-z]|[A-Z]")||e.match(/[@#!$%^&*()_+|~=`{}\[\]:";<>?\/]/))&&(e=e.substring(0,e.length-1));var c=this.getPrecision(t),h=void 0;"separator"===t?(e.includes(",")&&e.endsWith(",")&&e.indexOf(",")!==e.lastIndexOf(",")&&(e=e.substring(0,e.length-1)),(e.match("[a-z]|[A-Z]")||e.match(/[@#!$%^&*()_+|~=`{}\[\]:.";<>?\/]/))&&(e=e.substring(0,e.length-1)),h=e.replace(/\s/g,""),n=this.separator(h," ",".",c)):"dot_separator"===t||t.startsWith("dot_separator")?((e.match("[a-z]|[A-Z]")||e.match(/[@#!$%^&*()_+|~=`{}\[\]:\s";<>?\/]/))&&(e=e.substring(0,e.length-1)),h=(e=this.checkInputPrecision(e,c,",")).replace(/\./g,""),n=this.separator(h,".",",",c)):("coma_separator"===t||t.startsWith("coma_separator"))&&(h=(e=this.checkInputPrecision(e,c,".")).replace(/\,/g,""),n=this.separator(h,",",".",c)),i=r=n.length+1;var p=/\*|\?/g.test(t.slice(0,i))?o.length:i;this._shift.add(p+this.prefix.length||0)}else for(var l=0,u=o[0];l<o.length&&i!==t.length;u=o[++l])if(this._checkSymbolMask(u,t[i])&&"?"===t[i+1])n+=u,i+=2;else if("*"===t[i+1]&&a&&this._checkSymbolMask(u,t[i+2]))n+=u,i+=3,a=!1;else if(this._checkSymbolMask(u,t[i])&&"*"===t[i+1])n+=u,a=!0;else if("?"===t[i+1]&&this._checkSymbolMask(u,t[i+2]))n+=u,i+=3;else if(this._checkSymbolMask(u,t[i])){if("H"===t[i]&&2<Number(u)){n+=0,i+=1;p=/\*|\?/g.test(t.slice(0,i))?o.length:i;this._shift.add(p+this.prefix.length||0),l--;continue}if("h"===t[i]&&"2"===n&&3<Number(u))continue;if("m"===t[i]&&5<Number(u)){n+=0,i+=1;p=/\*|\?/g.test(t.slice(0,i))?o.length:i;this._shift.add(p+this.prefix.length||0),l--;continue}if("s"===t[i]&&5<Number(u)){n+=0,i+=1;p=/\*|\?/g.test(t.slice(0,i))?o.length:i;this._shift.add(p+this.prefix.length||0),l--;continue}if("d"===t[i]&&3<Number(u)){n+=0,i+=1;p=/\*|\?/g.test(t.slice(0,i))?o.length:i;this._shift.add(p+this.prefix.length||0),l--;continue}if("d"===t[i-1]&&31<Number(e.slice(i-1,i+1)))continue;if("m"===t[i]&&1<Number(u)){n+=0,i+=1;p=/\*|\?/g.test(t.slice(0,i))?o.length:i;this._shift.add(p+this.prefix.length||0),l--;continue}if("m"===t[i-1]&&12<Number(e.slice(i-1,i+1)))continue;n+=u,i++}else if(-1!==this.maskSpecialCharacters.indexOf(t[i])){n+=t[i],i++;p=/\*|\?/g.test(t.slice(0,i))?o.length:i;this._shift.add(p+this.prefix.length||0),l--}else-1<this.maskSpecialCharacters.indexOf(u)&&this.maskAvailablePatterns[t[i]]&&this.maskAvailablePatterns[t[i]].optional?(i++,l--):"*"===this.maskExpression[i+1]&&this._findSpecialChar(this.maskExpression[i+2])&&this._findSpecialChar(u)===this.maskExpression[i+2]&&a&&(i+=3,n+=u);n.length+1===t.length&&-1!==this.maskSpecialCharacters.indexOf(t[t.length-1])&&(n+=t[t.length-1]);for(var f=1,m=r+1;this._shift.has(m);)f++,m++;s(this._shift.has(r)?f:0);var k=""+this.prefix+n;return k=this.sufix?""+this.prefix+n+this.sufix:""+this.prefix+n,0===n.length&&(k=""+this.prefix+n),k},e.prototype._findSpecialChar=function(t){return this.maskSpecialCharacters.find(function(e){return e===t})},e.prototype._checkSymbolMask=function(e,t){return this.maskAvailablePatterns=this.customPattern?this.customPattern:this.maskAvailablePatterns,this.maskAvailablePatterns[t]&&this.maskAvailablePatterns[t].pattern&&this.maskAvailablePatterns[t].pattern.test(e)},e.decorators=[{type:i.Injectable}],e.ctorParameters=function(){return[{type:undefined,decorators:[{type:i.Inject,args:[n]}]}]},e}(),f=function(a){function e(e,t,r,s){var i=a.call(this,t)||this;return i.document=e,i._config=t,i._elementRef=r,i._renderer=s,i.maskExpression="",i.isNumberValue=!1,i.showMaskTyped=!1,i.maskIsShown="",i.onChange=function(e){},i.onTouch=function(){},i._formElement=i._elementRef.nativeElement,i}return function s(e,t){function r(){this.constructor=e}c(e,t),e.prototype=null===t?Object.create(t):(r.prototype=t.prototype,new r)}(e,a),e.prototype.applyMask=function(e,t,r,s){if(void 0===r&&(r=0),void 0===s&&(s=function(){}),this.maskIsShown=this.showMaskTyped?this.showMaskInInput():"",!e&&this.showMaskTyped)return this.prefix+this.maskIsShown;var i=a.prototype.applyMask.call(this,e,t,r,s);"dot_separator.2"===this.maskExpression&&!0===this.dropSpecialCharacters&&(this.maskSpecialCharacters=this.maskSpecialCharacters.filter(function(e){return","!==e})),"coma_separator.2"===this.maskExpression&&!0===this.dropSpecialCharacters&&(this.maskSpecialCharacters=this.maskSpecialCharacters.filter(function(e){return"."!==e})),console.table(this.maskSpecialCharacters,this.dropSpecialCharacters,this.maskExpression),Array.isArray(this.dropSpecialCharacters)?this.onChange(this._removeMask(this._removeSufix(this._removePrefix(i)),this.dropSpecialCharacters)):!0===this.dropSpecialCharacters?this.onChange(this.isNumberValue?Number(this._removeMask(this._removeSufix(this._removePrefix(i)),this.maskSpecialCharacters)):this._removeMask(this._removeSufix(this._removePrefix(i)),this.maskSpecialCharacters)):this.onChange(this._removeSufix(this._removePrefix(i)));if(!this.showMaskTyped)return i;var n=i.length;return i+(this.prefix+this.maskIsShown).slice(n)},e.prototype.applyValueChanges=function(e,t){void 0===e&&(e=0),void 0===t&&(t=function(){});var r=this.applyMask(this._formElement.value,this.maskExpression,e,t);this._formElement.value=r,this._formElement!==this.document.activeElement&&this.clearIfNotMatchFn()},e.prototype.showMaskInInput=function(){if(this.showMaskTyped&&this.shownMaskExpression){if(this.maskExpression.length!==this.shownMaskExpression.length)throw new Error("Mask expression must match mask placeholder length");return this.shownMaskExpression}return this.showMaskTyped?this.maskExpression.replace(/\w/g,"_"):""},e.prototype.clearIfNotMatchFn=function(){!0===this.clearIfNotMatch&&this.maskExpression.length!==this._formElement.value.length&&(this.formElementProperty=["value",""],this.applyMask(this._formElement.value,this.maskExpression))},Object.defineProperty(e.prototype,"formElementProperty",{set:function(e){var t=l(e,2),r=t[0],s=t[1];this._renderer.setProperty(this._formElement,r,s)},enumerable:!0,configurable:!0}),e.prototype._removeMask=function(e,t){return e?e.replace(this._regExpForRemove(t),""):e},e.prototype._removePrefix=function(e){return this.prefix&&e?e.replace(this.prefix,""):e},e.prototype._removeSufix=function(e){return this.sufix&&e?e.replace(this.sufix,""):e},e.prototype._regExpForRemove=function(e){return new RegExp(e.map(function(e){return"\\"+e}).join("|"),"gi")},e.decorators=[{type:i.Injectable}],e.ctorParameters=function(){return[{type:undefined,decorators:[{type:i.Inject,args:[r.DOCUMENT]}]},{type:undefined,decorators:[{type:i.Inject,args:[n]}]},{type:i.ElementRef},{type:i.Renderer2}]},e}(u),m=function(){function e(e,t){this.document=e,this._maskService=t,this._position=null,this.onChange=function(e){},this.onTouch=function(){}}return Object.defineProperty(e.prototype,"maskExpression",{set:function(e){this._maskValue=e||"",this._maskValue&&(this._maskService.maskExpression=this._repeatPatternSymbols(this._maskValue),this._maskService.formElementProperty=["value",this._maskService.applyMask(this._inputValue,this._maskService.maskExpression)])},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"specialCharacters",{set:function(e){e&&Array.isArray(e)&&(!Array.isArray(e)||e.length)&&(this._maskService.maskSpecialCharacters=e)},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"patterns",{set:function(e){e&&(this._maskService.maskAvailablePatterns=e)},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"prefix",{set:function(e){e&&(this._maskService.prefix=e)},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"sufix",{set:function(e){e&&(this._maskService.sufix=e)},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"dropSpecialCharacters",{set:function(e){this._maskService.dropSpecialCharacters=e},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"showMaskTyped",{set:function(e){e&&(this._maskService.showMaskTyped=e)},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"shownMaskExpression",{set:function(e){e&&(this._maskService.shownMaskExpression=e)},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"showTemplate",{set:function(e){this._maskService.showTemplate=e},enumerable:!0,configurable:!0}),Object.defineProperty(e.prototype,"clearIfNotMatch",{set:function(e){this._maskService.clearIfNotMatch=e},enumerable:!0,configurable:!0}),e.prototype.onInput=function(e){var t=e.target;if(this._inputValue=t.value,this._maskValue){var r=1===t.selectionStart?t.selectionStart+this._maskService.prefix.length:t.selectionStart,s=0;this._maskService.applyValueChanges(r,function(e){return s=e}),this.document.activeElement===t&&(t.selectionStart=t.selectionEnd=null!==this._position?this._position:r+("deleteContentBackward"===e.inputType?0:s),this._position=null)}else this.onChange(t.value)},e.prototype.onBlur=function(){this._maskService.clearIfNotMatchFn(),this.onTouch()},e.prototype.onFocus=function(e){var t=e.target;null!==t&&null!==t.selectionStart&&t.selectionStart===t.selectionEnd&&t.selectionStart>this._maskService.prefix.length&&38!==e.keyCode||(this._maskService.showMaskTyped&&(this._maskService.maskIsShown=this._maskService.showMaskInInput()),t.value=t.value&&t.value!==this._maskService.prefix?t.value:this._maskService.prefix+this._maskService.maskIsShown,(t.selectionStart||t.selectionEnd)<=this._maskService.prefix.length&&(t.selectionStart=this._maskService.prefix.length))},e.prototype.a=function(e){var t=e.target;38===e.keyCode&&e.preventDefault(),37!==e.keyCode&&8!==e.keyCode||(t.selectionStart<=this._maskService.prefix.length&&t.selectionEnd<=this._maskService.prefix.length&&e.preventDefault(),this.onFocus(e),8===e.keyCode&&0===t.selectionStart&&t.selectionEnd===t.value.length&&(t.value=this._maskService.prefix,this._position=this._maskService.prefix?this._maskService.prefix.length:1,this.onInput(e)))},e.prototype.onPaste=function(){this._position=Number.MAX_SAFE_INTEGER},e.prototype.writeValue=function(t){return function e(t,a,o,c){return new(o||(o=Promise))(function(e,r){function s(e){try{n(c.next(e))}catch(t){r(t)}}function i(e){try{n(c["throw"](e))}catch(t){r(t)}}function n(t){t.done?e(t.value):new o(function(e){e(t.value)}).then(s,i)}n((c=c.apply(t,a||[])).next())})}(this,void 0,void 0,function(){return p(this,function(e){return t===undefined&&(t=""),"number"==typeof t&&(t=String(t),this._maskService.isNumberValue=!0),t&&this._maskService.maskExpression||this._maskService.maskExpression&&(this._maskService.prefix||this._maskService.showMaskTyped)?this._maskService.formElementProperty=["value",this._maskService.applyMask(t,this._maskService.maskExpression)]:this._maskService.formElementProperty=["value",t],this._inputValue=t,[2]})})},e.prototype.registerOnChange=function(e){this.onChange=e,this._maskService.onChange=this.onChange},e.prototype.registerOnTouched=function(e){this.onTouch=e},e.prototype.setDisabledState=function(e){this._maskService.formElementProperty=["disabled",e]},e.prototype._repeatPatternSymbols=function(i){var n=this;return i.match(/{[0-9]+}/)&&i.split("").reduce(function(e,t,r){if(n._start="{"===t?r:n._start,"}"!==t)return n._maskService._findSpecialChar(t)?e+t:e;n._end=r;var s=Number(i.slice(n._start+1,n._end));return e+new Array(s+1).join(i[n._start-1])},"")||i},e.decorators=[{type:i.Directive,args:[{selector:"[mask]",providers:[{provide:t.NG_VALUE_ACCESSOR,useExisting:i.forwardRef(function(){return e}),multi:!0},f]}]}],e.ctorParameters=function(){return[{type:undefined,decorators:[{type:i.Inject,args:[r.DOCUMENT]}]},{type:f}]},e.propDecorators={maskExpression:[{type:i.Input,args:["mask"]}],specialCharacters:[{type:i.Input}],patterns:[{type:i.Input}],prefix:[{type:i.Input}],sufix:[{type:i.Input}],dropSpecialCharacters:[{type:i.Input}],showMaskTyped:[{type:i.Input}],shownMaskExpression:[{type:i.Input}],showTemplate:[{type:i.Input}],clearIfNotMatch:[{type:i.Input}],onInput:[{type:i.HostListener,args:["input",["$event"]]}],onBlur:[{type:i.HostListener,args:["blur"]}],onFocus:[{type:i.HostListener,args:["click",["$event"]]}],a:[{type:i.HostListener,args:["keydown",["$event"]]}],onPaste:[{type:i.HostListener,args:["paste"]}]},e}(),k=function(){function e(e){this._maskService=e}return e.prototype.transform=function(e,t){return e?"string"==typeof t?this._maskService.applyMask(""+e,t):this._maskService.applyMaskWithPattern(""+e,t):""},e.decorators=[{type:i.Pipe,args:[{name:"mask",pure:!0}]}],e.ctorParameters=function(){return[{type:u}]},e}(),d=function(){function t(){}return t.forRoot=function(e){return{ngModule:t,providers:[{provide:s,useValue:e},{provide:a,useValue:o},{provide:n,useFactory:y,deps:[a,s]}]}},t.forChild=function(e){return{ngModule:t}},t.decorators=[{type:i.NgModule,args:[{providers:[u],exports:[m,k],declarations:[m,k]}]}],t}();function y(e,t){return"function"==typeof t?t():h({},e,t)}e.config=n,e.NEW_CONFIG=s,e.INITIAL_CONFIG=a,e.initialConfig=o,e.MaskDirective=m,e.MaskService=f,e._configFactory=y,e.NgxMaskModule=d,e.MaskPipe=k,e.ɵa=u,Object.defineProperty(e,"__esModule",{value:!0})});
 //# sourceMappingURL=ngx-mask.umd.min.js.map

esm2015/app/ngx-mask/mask.service.js

@@ -55,2 +55,18 @@ /**
         const result = super.applyMask(inputValue, maskExpression, position, cb);
+        if (this.maskExpression === 'dot_separator.2' && this.dropSpecialCharacters === true) {
+            this.maskSpecialCharacters = this.maskSpecialCharacters.filter((/**
+             * @param {?} item
+             * @return {?}
+             */
+            (item) => item !== ','));
+        }
+        if ((this.maskExpression === 'coma_separator.2' && this.dropSpecialCharacters === true)) {
+            this.maskSpecialCharacters = this.maskSpecialCharacters.filter((/**
+             * @param {?} item
+             * @return {?}
+             */
+            (item) => item !== '.'));
+        }
+        // tslint:disable-next-line:no-console
+        console.table(this.maskSpecialCharacters, this.dropSpecialCharacters, this.maskExpression);
         Array.isArray(this.dropSpecialCharacters)
@@ -225,2 +241,2 @@ ? this.onChange(this._removeMask(this._removeSufix(this._removePrefix(result)), this.dropSpecialCharacters))
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mask.service.js","sourceRoot":"ng://ngx-mask/","sources":["app/ngx-mask/mask.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { ElementRef, Inject, Injectable, Renderer2 } from '@angular/core';\nimport { config, IConfig } from './config';\nimport { DOCUMENT } from '@angular/common';\nimport { MaskApplierService } from './mask-applier.service';\n\n@Injectable()\nexport class MaskService extends MaskApplierService {\n  public maskExpression: string = '';\n  public isNumberValue: boolean = false;\n  public showMaskTyped: boolean = false;\n  public maskIsShown: string = '';\n  private _formElement: HTMLInputElement;\n  // tslint:disable-next-line\n  public onChange = (_: any) => {};\n  public onTouch = () => {};\n  public constructor(\n    // tslint:disable-next-line\n    @Inject(DOCUMENT) private document: any,\n    @Inject(config) protected _config: IConfig,\n    private _elementRef: ElementRef,\n    private _renderer: Renderer2\n  ) {\n    super(_config);\n    this._formElement = this._elementRef.nativeElement;\n  }\n\n  public applyMask(\n    inputValue: string,\n    maskExpression: string,\n    position: number = 0,\n    cb: Function = () => {}\n  ): string  {\n\n    this.maskIsShown = this.showMaskTyped ? this.showMaskInInput() : '';\n    if (!inputValue && this.showMaskTyped) {\n      return this.prefix + this.maskIsShown;\n    }\n    const result: string  = super.applyMask(\n      inputValue,\n      maskExpression,\n      position,\n      cb\n    );\n    Array.isArray(this.dropSpecialCharacters)\n      ? this.onChange(this._removeMask(this._removeSufix(this._removePrefix(result)), this.dropSpecialCharacters))\n      : this.dropSpecialCharacters === true\n      ? this.onChange(\n        this.isNumberValue\n          ? Number(this._removeMask(this._removeSufix(this._removePrefix(result)), this.maskSpecialCharacters))\n          : this._removeMask(this._removeSufix(this._removePrefix(result)), this.maskSpecialCharacters)\n      )\n      : this.onChange(this._removeSufix(this._removePrefix(result)));\n    let ifMaskIsShown: string = '';\n    if (!this.showMaskTyped) {\n      return result;\n    }\n    const resLen: number = result.length;\n    const prefNmask: string = this.prefix + this.maskIsShown;\n    ifMaskIsShown = prefNmask.slice(resLen);\n    return result + ifMaskIsShown;\n  }\n\n  public applyValueChanges(\n    position: number = 0,\n    cb: Function = () => {}\n  ): void {\n    const maskedInput: string | number = this.applyMask(\n      this._formElement.value,\n      this.maskExpression,\n      position,\n      cb\n    );\n    this._formElement.value = maskedInput;\n    if (this._formElement === this.document.activeElement) {\n      return;\n    }\n    this.clearIfNotMatchFn();\n  }\n\n  public showMaskInInput(): string {\n    if (this.showMaskTyped && !!this.shownMaskExpression) {\n      if (this.maskExpression.length !== this.shownMaskExpression.length) {\n        throw new Error('Mask expression must match mask placeholder length');\n      } else {\n        return this.shownMaskExpression;\n      }\n    } else if (this.showMaskTyped) {\n      return this.maskExpression.replace(/\\w/g, '_');\n    }\n    return '';\n  }\n\n  public clearIfNotMatchFn(): void {\n    if (\n      this.clearIfNotMatch === true &&\n      this.maskExpression.length !== this._formElement.value.length\n    ) {\n      this.formElementProperty = ['value', ''];\n      this.applyMask(this._formElement.value, this.maskExpression);\n    }\n  }\n\n  public set formElementProperty([name, value]: [string, string | boolean]) {\n    this._renderer.setProperty(this._formElement, name, value);\n  }\n\n  private _removeMask(\n    value: string,\n    specialCharactersForRemove: string[]\n  ): string {\n    return value\n      ? value.replace(this._regExpForRemove(specialCharactersForRemove), '')\n      : value;\n  }\n\n  private _removePrefix(value: string): string {\n    if (!this.prefix) {\n      return value;\n    }\n    return value\n      ? value.replace(this.prefix, '')\n      : value;\n  }\n\n  private _removeSufix(value: string): string {\n    if (!this.sufix) {\n      return value;\n    }\n    return value\n      ? value.replace(this.sufix, '')\n      : value;\n  }\n\n  private _regExpForRemove(specialCharactersForRemove: string[]): RegExp {\n    return new RegExp(\n      specialCharactersForRemove.map((item: string) => `\\\\${item}`).join('|'),\n      'gi'\n    );\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mask.service.js","sourceRoot":"ng://ngx-mask/","sources":["app/ngx-mask/mask.service.ts"],"names":[],"mappings":";;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1E,OAAO,EAAE,MAAM,EAAW,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAG5D,MAAM,OAAO,WAAY,SAAQ,kBAAkB;;;;;;;IASjD,YAE4B,QAAa,EACb,OAAgB,EAClC,WAAuB,EACvB,SAAoB;QAE5B,KAAK,CAAC,OAAO,CAAC,CAAC;QALW,aAAQ,GAAR,QAAQ,CAAK;QACb,YAAO,GAAP,OAAO,CAAS;QAClC,gBAAW,GAAX,WAAW,CAAY;QACvB,cAAS,GAAT,SAAS,CAAW;QAbvB,mBAAc,GAAW,EAAE,CAAC;QAC5B,kBAAa,GAAY,KAAK,CAAC;QAC/B,kBAAa,GAAY,KAAK,CAAC;QAC/B,gBAAW,GAAW,EAAE,CAAC;;QAGzB,aAAQ;;;;QAAG,CAAC,CAAM,EAAE,EAAE,GAAG,CAAC,EAAC;QAC3B,YAAO;;;QAAG,GAAG,EAAE,GAAG,CAAC,EAAC;QASzB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC;IACrD,CAAC;;;;;;;;IAEM,SAAS,CACd,UAAkB,EAClB,cAAsB,EACtB,WAAmB,CAAC,EACpB;;;IAAe,GAAG,EAAE,GAAG,CAAC,CAAA;QAGxB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpE,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,aAAa,EAAE;YACrC,OAAO,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC;SACvC;;cACK,MAAM,GAAW,KAAK,CAAC,SAAS,CACpC,UAAU,EACV,cAAc,EACd,QAAQ,EACR,EAAE,CACH;QACD,IAAI,IAAI,CAAC,cAAc,KAAK,iBAAiB,IAAI,IAAI,CAAC,qBAAqB,KAAK,IAAI,EAAE;YACpF,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,MAAM;;;;YAAC,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,KAAK,GAAG,EAAC,CAAC;SAChG;QACD,IAAI,CAAC,IAAI,CAAC,cAAc,KAAK,kBAAkB,IAAI,IAAI,CAAC,qBAAqB,KAAK,IAAI,CAAC,EAAE;YACvF,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,MAAM;;;;YAAC,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,KAAK,GAAG,EAAC,CAAC;SAEhG;QACD,sCAAsC;QACtC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,qBAAqB,EAAE,IAAI,CAAC,qBAAqB,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAC3F,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC;YACvC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;YAC5G,CAAC,CAAC,IAAI,CAAC,qBAAqB,KAAK,IAAI;gBACnC,CAAC,CAAC,IAAI,CAAC,QAAQ,CACb,IAAI,CAAC,aAAa;oBAChB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;oBACrG,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAChG;gBACD,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;;YAC/D,aAAa,GAAW,EAAE;QAC9B,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACvB,OAAO,MAAM,CAAC;SACf;;cACK,MAAM,GAAW,MAAM,CAAC,MAAM;;cAC9B,SAAS,GAAW,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,WAAW;QACxD,aAAa,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACxC,OAAO,MAAM,GAAG,aAAa,CAAC;IAChC,CAAC;;;;;;IAEM,iBAAiB,CACtB,WAAmB,CAAC,EACpB;;;IAAe,GAAG,EAAE,GAAG,CAAC,CAAA;;cAElB,WAAW,GAAoB,IAAI,CAAC,SAAS,CACjD,IAAI,CAAC,YAAY,CAAC,KAAK,EACvB,IAAI,CAAC,cAAc,EACnB,QAAQ,EACR,EAAE,CACH;QACD,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,WAAW,CAAC;QACtC,IAAI,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE;YACrD,OAAO;SACR;QACD,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;;;;IAEM,eAAe;QACpB,IAAI,IAAI,CAAC,aAAa,IAAI,CAAC,CAAC,IAAI,CAAC,mBAAmB,EAAE;YACpD,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,KAAK,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE;gBAClE,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;aACvE;iBAAM;gBACL,OAAO,IAAI,CAAC,mBAAmB,CAAC;aACjC;SACF;aAAM,IAAI,IAAI,CAAC,aAAa,EAAE;YAC7B,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;SAChD;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;;;;IAEM,iBAAiB;QACtB,IACE,IAAI,CAAC,eAAe,KAAK,IAAI;YAC7B,IAAI,CAAC,cAAc,CAAC,MAAM,KAAK,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,EAC7D;YACA,IAAI,CAAC,mBAAmB,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YACzC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;SAC9D;IACH,CAAC;;;;;IAED,IAAW,mBAAmB,CAAC,CAAC,IAAI,EAAE,KAAK,CAA6B;QACtE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAC7D,CAAC;;;;;;;IAEO,WAAW,CACjB,KAAa,EACb,0BAAoC;QAEpC,OAAO,KAAK;YACV,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,0BAA0B,CAAC,EAAE,EAAE,CAAC;YACtE,CAAC,CAAC,KAAK,CAAC;IACZ,CAAC;;;;;;IAEO,aAAa,CAAC,KAAa;QACjC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,OAAO,KAAK,CAAC;SACd;QACD,OAAO,KAAK;YACV,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;YAChC,CAAC,CAAC,KAAK,CAAC;IACZ,CAAC;;;;;;IAEO,YAAY,CAAC,KAAa;QAChC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACf,OAAO,KAAK,CAAC;SACd;QACD,OAAO,KAAK;YACV,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC;YAC/B,CAAC,CAAC,KAAK,CAAC;IACZ,CAAC;;;;;;IAEO,gBAAgB,CAAC,0BAAoC;QAC3D,OAAO,IAAI,MAAM,CACf,0BAA0B,CAAC,GAAG;;;;QAAC,CAAC,IAAY,EAAE,EAAE,CAAC,KAAK,IAAI,EAAE,EAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EACvE,IAAI,CACL,CAAC;IACJ,CAAC;;;YA9IF,UAAU;;;;4CAYN,MAAM,SAAC,QAAQ;4CACf,MAAM,SAAC,MAAM;YAlBT,UAAU;YAAsB,SAAS;;;;IAOhD,qCAAmC;;IACnC,oCAAsC;;IACtC,oCAAsC;;IACtC,kCAAgC;;;;;IAChC,mCAAuC;;IAEvC,+BAAkC;;IAClC,8BAA2B;;;;;IAGzB,+BAAuC;;;;;IACvC,8BAA0C;;;;;IAC1C,kCAA+B;;;;;IAC/B,gCAA4B","sourcesContent":["import { ElementRef, Inject, Injectable, Renderer2 } from '@angular/core';\nimport { config, IConfig } from './config';\nimport { DOCUMENT } from '@angular/common';\nimport { MaskApplierService } from './mask-applier.service';\n\n@Injectable()\nexport class MaskService extends MaskApplierService {\n  public maskExpression: string = '';\n  public isNumberValue: boolean = false;\n  public showMaskTyped: boolean = false;\n  public maskIsShown: string = '';\n  private _formElement: HTMLInputElement;\n  // tslint:disable-next-line\n  public onChange = (_: any) => { };\n  public onTouch = () => { };\n  public constructor(\n    // tslint:disable-next-line\n    @Inject(DOCUMENT) private document: any,\n    @Inject(config) protected _config: IConfig,\n    private _elementRef: ElementRef,\n    private _renderer: Renderer2\n  ) {\n    super(_config);\n    this._formElement = this._elementRef.nativeElement;\n  }\n\n  public applyMask(\n    inputValue: string,\n    maskExpression: string,\n    position: number = 0,\n    cb: Function = () => { }\n  ): string {\n\n    this.maskIsShown = this.showMaskTyped ? this.showMaskInInput() : '';\n    if (!inputValue && this.showMaskTyped) {\n      return this.prefix + this.maskIsShown;\n    }\n    const result: string = super.applyMask(\n      inputValue,\n      maskExpression,\n      position,\n      cb\n    );\n    if (this.maskExpression === 'dot_separator.2' && this.dropSpecialCharacters === true) {\n      this.maskSpecialCharacters = this.maskSpecialCharacters.filter((item: string) => item !== ',');\n    }\n    if ((this.maskExpression === 'coma_separator.2' && this.dropSpecialCharacters === true)) {\n      this.maskSpecialCharacters = this.maskSpecialCharacters.filter((item: string) => item !== '.');\n\n    }\n    // tslint:disable-next-line:no-console\n    console.table(this.maskSpecialCharacters, this.dropSpecialCharacters, this.maskExpression);\n    Array.isArray(this.dropSpecialCharacters)\n      ? this.onChange(this._removeMask(this._removeSufix(this._removePrefix(result)), this.dropSpecialCharacters))\n      : this.dropSpecialCharacters === true\n        ? this.onChange(\n          this.isNumberValue\n            ? Number(this._removeMask(this._removeSufix(this._removePrefix(result)), this.maskSpecialCharacters))\n            : this._removeMask(this._removeSufix(this._removePrefix(result)), this.maskSpecialCharacters)\n        )\n        : this.onChange(this._removeSufix(this._removePrefix(result)));\n    let ifMaskIsShown: string = '';\n    if (!this.showMaskTyped) {\n      return result;\n    }\n    const resLen: number = result.length;\n    const prefNmask: string = this.prefix + this.maskIsShown;\n    ifMaskIsShown = prefNmask.slice(resLen);\n    return result + ifMaskIsShown;\n  }\n\n  public applyValueChanges(\n    position: number = 0,\n    cb: Function = () => { }\n  ): void {\n    const maskedInput: string | number = this.applyMask(\n      this._formElement.value,\n      this.maskExpression,\n      position,\n      cb\n    );\n    this._formElement.value = maskedInput;\n    if (this._formElement === this.document.activeElement) {\n      return;\n    }\n    this.clearIfNotMatchFn();\n  }\n\n  public showMaskInInput(): string {\n    if (this.showMaskTyped && !!this.shownMaskExpression) {\n      if (this.maskExpression.length !== this.shownMaskExpression.length) {\n        throw new Error('Mask expression must match mask placeholder length');\n      } else {\n        return this.shownMaskExpression;\n      }\n    } else if (this.showMaskTyped) {\n      return this.maskExpression.replace(/\\w/g, '_');\n    }\n    return '';\n  }\n\n  public clearIfNotMatchFn(): void {\n    if (\n      this.clearIfNotMatch === true &&\n      this.maskExpression.length !== this._formElement.value.length\n    ) {\n      this.formElementProperty = ['value', ''];\n      this.applyMask(this._formElement.value, this.maskExpression);\n    }\n  }\n\n  public set formElementProperty([name, value]: [string, string | boolean]) {\n    this._renderer.setProperty(this._formElement, name, value);\n  }\n\n  private _removeMask(\n    value: string,\n    specialCharactersForRemove: string[]\n  ): string {\n    return value\n      ? value.replace(this._regExpForRemove(specialCharactersForRemove), '')\n      : value;\n  }\n\n  private _removePrefix(value: string): string {\n    if (!this.prefix) {\n      return value;\n    }\n    return value\n      ? value.replace(this.prefix, '')\n      : value;\n  }\n\n  private _removeSufix(value: string): string {\n    if (!this.sufix) {\n      return value;\n    }\n    return value\n      ? value.replace(this.sufix, '')\n      : value;\n  }\n\n  private _regExpForRemove(specialCharactersForRemove: string[]): RegExp {\n    return new RegExp(\n      specialCharactersForRemove.map((item: string) => `\\\\${item}`).join('|'),\n      'gi'\n    );\n  }\n}\n"]}

esm5/app/ngx-mask/mask.service.js

@@ -61,2 +61,18 @@ /**
         var result = _super.prototype.applyMask.call(this, inputValue, maskExpression, position, cb);
+        if (this.maskExpression === 'dot_separator.2' && this.dropSpecialCharacters === true) {
+            this.maskSpecialCharacters = this.maskSpecialCharacters.filter((/**
+             * @param {?} item
+             * @return {?}
+             */
+            function (item) { return item !== ','; }));
+        }
+        if ((this.maskExpression === 'coma_separator.2' && this.dropSpecialCharacters === true)) {
+            this.maskSpecialCharacters = this.maskSpecialCharacters.filter((/**
+             * @param {?} item
+             * @return {?}
+             */
+            function (item) { return item !== '.'; }));
+        }
+        // tslint:disable-next-line:no-console
+        console.table(this.maskSpecialCharacters, this.dropSpecialCharacters, this.maskExpression);
         Array.isArray(this.dropSpecialCharacters)
@@ -272,2 +288,2 @@ ? this.onChange(this._removeMask(this._removeSufix(this._removePrefix(result)), this.dropSpecialCharacters))
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mask.service.js","sourceRoot":"ng://ngx-mask/","sources":["app/ngx-mask/mask.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { ElementRef, Inject, Injectable, Renderer2 } from '@angular/core';\nimport { config, IConfig } from './config';\nimport { DOCUMENT } from '@angular/common';\nimport { MaskApplierService } from './mask-applier.service';\n\n@Injectable()\nexport class MaskService extends MaskApplierService {\n  public maskExpression: string = '';\n  public isNumberValue: boolean = false;\n  public showMaskTyped: boolean = false;\n  public maskIsShown: string = '';\n  private _formElement: HTMLInputElement;\n  // tslint:disable-next-line\n  public onChange = (_: any) => {};\n  public onTouch = () => {};\n  public constructor(\n    // tslint:disable-next-line\n    @Inject(DOCUMENT) private document: any,\n    @Inject(config) protected _config: IConfig,\n    private _elementRef: ElementRef,\n    private _renderer: Renderer2\n  ) {\n    super(_config);\n    this._formElement = this._elementRef.nativeElement;\n  }\n\n  public applyMask(\n    inputValue: string,\n    maskExpression: string,\n    position: number = 0,\n    cb: Function = () => {}\n  ): string  {\n\n    this.maskIsShown = this.showMaskTyped ? this.showMaskInInput() : '';\n    if (!inputValue && this.showMaskTyped) {\n      return this.prefix + this.maskIsShown;\n    }\n    const result: string  = super.applyMask(\n      inputValue,\n      maskExpression,\n      position,\n      cb\n    );\n    Array.isArray(this.dropSpecialCharacters)\n      ? this.onChange(this._removeMask(this._removeSufix(this._removePrefix(result)), this.dropSpecialCharacters))\n      : this.dropSpecialCharacters === true\n      ? this.onChange(\n        this.isNumberValue\n          ? Number(this._removeMask(this._removeSufix(this._removePrefix(result)), this.maskSpecialCharacters))\n          : this._removeMask(this._removeSufix(this._removePrefix(result)), this.maskSpecialCharacters)\n      )\n      : this.onChange(this._removeSufix(this._removePrefix(result)));\n    let ifMaskIsShown: string = '';\n    if (!this.showMaskTyped) {\n      return result;\n    }\n    const resLen: number = result.length;\n    const prefNmask: string = this.prefix + this.maskIsShown;\n    ifMaskIsShown = prefNmask.slice(resLen);\n    return result + ifMaskIsShown;\n  }\n\n  public applyValueChanges(\n    position: number = 0,\n    cb: Function = () => {}\n  ): void {\n    const maskedInput: string | number = this.applyMask(\n      this._formElement.value,\n      this.maskExpression,\n      position,\n      cb\n    );\n    this._formElement.value = maskedInput;\n    if (this._formElement === this.document.activeElement) {\n      return;\n    }\n    this.clearIfNotMatchFn();\n  }\n\n  public showMaskInInput(): string {\n    if (this.showMaskTyped && !!this.shownMaskExpression) {\n      if (this.maskExpression.length !== this.shownMaskExpression.length) {\n        throw new Error('Mask expression must match mask placeholder length');\n      } else {\n        return this.shownMaskExpression;\n      }\n    } else if (this.showMaskTyped) {\n      return this.maskExpression.replace(/\\w/g, '_');\n    }\n    return '';\n  }\n\n  public clearIfNotMatchFn(): void {\n    if (\n      this.clearIfNotMatch === true &&\n      this.maskExpression.length !== this._formElement.value.length\n    ) {\n      this.formElementProperty = ['value', ''];\n      this.applyMask(this._formElement.value, this.maskExpression);\n    }\n  }\n\n  public set formElementProperty([name, value]: [string, string | boolean]) {\n    this._renderer.setProperty(this._formElement, name, value);\n  }\n\n  private _removeMask(\n    value: string,\n    specialCharactersForRemove: string[]\n  ): string {\n    return value\n      ? value.replace(this._regExpForRemove(specialCharactersForRemove), '')\n      : value;\n  }\n\n  private _removePrefix(value: string): string {\n    if (!this.prefix) {\n      return value;\n    }\n    return value\n      ? value.replace(this.prefix, '')\n      : value;\n  }\n\n  private _removeSufix(value: string): string {\n    if (!this.sufix) {\n      return value;\n    }\n    return value\n      ? value.replace(this.sufix, '')\n      : value;\n  }\n\n  private _regExpForRemove(specialCharactersForRemove: string[]): RegExp {\n    return new RegExp(\n      specialCharactersForRemove.map((item: string) => `\\\\${item}`).join('|'),\n      'gi'\n    );\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mask.service.js","sourceRoot":"ng://ngx-mask/","sources":["app/ngx-mask/mask.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { ElementRef, Inject, Injectable, Renderer2 } from '@angular/core';\nimport { config, IConfig } from './config';\nimport { DOCUMENT } from '@angular/common';\nimport { MaskApplierService } from './mask-applier.service';\n\n@Injectable()\nexport class MaskService extends MaskApplierService {\n  public maskExpression: string = '';\n  public isNumberValue: boolean = false;\n  public showMaskTyped: boolean = false;\n  public maskIsShown: string = '';\n  private _formElement: HTMLInputElement;\n  // tslint:disable-next-line\n  public onChange = (_: any) => { };\n  public onTouch = () => { };\n  public constructor(\n    // tslint:disable-next-line\n    @Inject(DOCUMENT) private document: any,\n    @Inject(config) protected _config: IConfig,\n    private _elementRef: ElementRef,\n    private _renderer: Renderer2\n  ) {\n    super(_config);\n    this._formElement = this._elementRef.nativeElement;\n  }\n\n  public applyMask(\n    inputValue: string,\n    maskExpression: string,\n    position: number = 0,\n    cb: Function = () => { }\n  ): string {\n\n    this.maskIsShown = this.showMaskTyped ? this.showMaskInInput() : '';\n    if (!inputValue && this.showMaskTyped) {\n      return this.prefix + this.maskIsShown;\n    }\n    const result: string = super.applyMask(\n      inputValue,\n      maskExpression,\n      position,\n      cb\n    );\n    if (this.maskExpression === 'dot_separator.2' && this.dropSpecialCharacters === true) {\n      this.maskSpecialCharacters = this.maskSpecialCharacters.filter((item: string) => item !== ',');\n    }\n    if ((this.maskExpression === 'coma_separator.2' && this.dropSpecialCharacters === true)) {\n      this.maskSpecialCharacters = this.maskSpecialCharacters.filter((item: string) => item !== '.');\n\n    }\n    // tslint:disable-next-line:no-console\n    console.table(this.maskSpecialCharacters, this.dropSpecialCharacters, this.maskExpression);\n    Array.isArray(this.dropSpecialCharacters)\n      ? this.onChange(this._removeMask(this._removeSufix(this._removePrefix(result)), this.dropSpecialCharacters))\n      : this.dropSpecialCharacters === true\n        ? this.onChange(\n          this.isNumberValue\n            ? Number(this._removeMask(this._removeSufix(this._removePrefix(result)), this.maskSpecialCharacters))\n            : this._removeMask(this._removeSufix(this._removePrefix(result)), this.maskSpecialCharacters)\n        )\n        : this.onChange(this._removeSufix(this._removePrefix(result)));\n    let ifMaskIsShown: string = '';\n    if (!this.showMaskTyped) {\n      return result;\n    }\n    const resLen: number = result.length;\n    const prefNmask: string = this.prefix + this.maskIsShown;\n    ifMaskIsShown = prefNmask.slice(resLen);\n    return result + ifMaskIsShown;\n  }\n\n  public applyValueChanges(\n    position: number = 0,\n    cb: Function = () => { }\n  ): void {\n    const maskedInput: string | number = this.applyMask(\n      this._formElement.value,\n      this.maskExpression,\n      position,\n      cb\n    );\n    this._formElement.value = maskedInput;\n    if (this._formElement === this.document.activeElement) {\n      return;\n    }\n    this.clearIfNotMatchFn();\n  }\n\n  public showMaskInInput(): string {\n    if (this.showMaskTyped && !!this.shownMaskExpression) {\n      if (this.maskExpression.length !== this.shownMaskExpression.length) {\n        throw new Error('Mask expression must match mask placeholder length');\n      } else {\n        return this.shownMaskExpression;\n      }\n    } else if (this.showMaskTyped) {\n      return this.maskExpression.replace(/\\w/g, '_');\n    }\n    return '';\n  }\n\n  public clearIfNotMatchFn(): void {\n    if (\n      this.clearIfNotMatch === true &&\n      this.maskExpression.length !== this._formElement.value.length\n    ) {\n      this.formElementProperty = ['value', ''];\n      this.applyMask(this._formElement.value, this.maskExpression);\n    }\n  }\n\n  public set formElementProperty([name, value]: [string, string | boolean]) {\n    this._renderer.setProperty(this._formElement, name, value);\n  }\n\n  private _removeMask(\n    value: string,\n    specialCharactersForRemove: string[]\n  ): string {\n    return value\n      ? value.replace(this._regExpForRemove(specialCharactersForRemove), '')\n      : value;\n  }\n\n  private _removePrefix(value: string): string {\n    if (!this.prefix) {\n      return value;\n    }\n    return value\n      ? value.replace(this.prefix, '')\n      : value;\n  }\n\n  private _removeSufix(value: string): string {\n    if (!this.sufix) {\n      return value;\n    }\n    return value\n      ? value.replace(this.sufix, '')\n      : value;\n  }\n\n  private _regExpForRemove(specialCharactersForRemove: string[]): RegExp {\n    return new RegExp(\n      specialCharactersForRemove.map((item: string) => `\\\\${item}`).join('|'),\n      'gi'\n    );\n  }\n}\n"]}

fesm2015/ngx-mask.js

@@ -487,2 +487,18 @@ import { __awaiter } from 'tslib';
         const result = super.applyMask(inputValue, maskExpression, position, cb);
+        if (this.maskExpression === 'dot_separator.2' && this.dropSpecialCharacters === true) {
+            this.maskSpecialCharacters = this.maskSpecialCharacters.filter((/**
+             * @param {?} item
+             * @return {?}
+             */
+            (item) => item !== ','));
+        }
+        if ((this.maskExpression === 'coma_separator.2' && this.dropSpecialCharacters === true)) {
+            this.maskSpecialCharacters = this.maskSpecialCharacters.filter((/**
+             * @param {?} item
+             * @return {?}
+             */
+            (item) => item !== '.'));
+        }
+        // tslint:disable-next-line:no-console
+        console.table(this.maskSpecialCharacters, this.dropSpecialCharacters, this.maskExpression);
         Array.isArray(this.dropSpecialCharacters)
@@ -489,0 +505,0 @@ ? this.onChange(this._removeMask(this._removeSufix(this._removePrefix(result)), this.dropSpecialCharacters))

fesm5/ngx-mask.js

@@ -517,2 +517,18 @@ import { NG_VALUE_ACCESSOR } from '@angular/forms';
         var result = _super.prototype.applyMask.call(this, inputValue, maskExpression, position, cb);
+        if (this.maskExpression === 'dot_separator.2' && this.dropSpecialCharacters === true) {
+            this.maskSpecialCharacters = this.maskSpecialCharacters.filter((/**
+             * @param {?} item
+             * @return {?}
+             */
+            function (item) { return item !== ','; }));
+        }
+        if ((this.maskExpression === 'coma_separator.2' && this.dropSpecialCharacters === true)) {
+            this.maskSpecialCharacters = this.maskSpecialCharacters.filter((/**
+             * @param {?} item
+             * @return {?}
+             */
+            function (item) { return item !== '.'; }));
+        }
+        // tslint:disable-next-line:no-console
+        console.table(this.maskSpecialCharacters, this.dropSpecialCharacters, this.maskExpression);
         Array.isArray(this.dropSpecialCharacters)
@@ -519,0 +535,0 @@ ? this.onChange(this._removeMask(this._removeSufix(this._removePrefix(result)), this.dropSpecialCharacters))

package.json

 {
   "name": "ngx-mask",
-  "version": "7.4.0",
+  "version": "7.4.1",
   "description": "awesome ngx mask",
@@ -5,0 +5,0 @@ "license": "MIT",

No alert changes

Improved metrics

Total package byte prevSize

673353

increased by1.7%

Lines of code

6602

increased by1.23%

No dependency changes