@sumaris-net/ngx-components 0.27.12 → 0.27.16

package/bundles/sumaris-net.ngx-components.umd.js

@@ -2654,7 +2654,7 @@
         function ArrayIncludesPipe() {
         }
         ArrayIncludesPipe.prototype.transform = function (val, args) {
-            return val && val.includes(args);
+            return val && val.includes(args) || false;
         };
         return ArrayIncludesPipe;
     }());
@@ -2805,7 +2805,7 @@
             // Compute a contextual i18n key, using the context as suffix
             var contextKey = this.contextualKey(key, context);
             // Return the contextual translation, or default of not exists
-            return this.translate.get(contextKey)
+            return this.translate.get(contextKey, interpolateParams)
                 .pipe(operators.mergeMap(function (translation) { return (translation !== contextKey) ? rxjs.of(translation) : _this.translate.get(key); }));
         };
         TranslateContextService.prototype.instant = function (key, context, interpolateParams) {
@@ -2815,8 +2815,8 @@
             // Compute a contextual i18n key, using the context as suffix
             var contextualKey = this.contextualKey(key, context);
             // Return the contextual translation, or default of not exists
-            var translation = this.translate.instant(contextualKey);
-            return (translation !== contextualKey) ? translation : this.translate.instant(key);
+            var translation = this.translate.instant(contextualKey, interpolateParams);
+            return (translation !== contextualKey) ? translation : this.translate.instant(key, interpolateParams);
         };
         /**
          * Compute a contextual i18n key, using the context as suffix
@@ -2926,6 +2926,18 @@
     var SharedValidators = /** @class */ (function () {
         function SharedValidators() {
         }
+        SharedValidators.getDoubleRegexp = function (maxDecimals) {
+            if (isNil(maxDecimals))
+                return this._REGEXP_CACHE.DOUBLE_BY_MAX_DECIMALS.NO_LIMIT;
+            if (maxDecimals < 0)
+                throw new Error("Invalid maxDecimals value: " + maxDecimals);
+            var regexp = this._REGEXP_CACHE.DOUBLE_BY_MAX_DECIMALS[maxDecimals];
+            if (regexp)
+                return regexp;
+            // New regexp: add it to cache
+            this._REGEXP_CACHE.DOUBLE_BY_MAX_DECIMALS[maxDecimals] = new RegExp("^[-]?[0-9]+([.,][0-9]{1," + maxDecimals + "})?$");
+            return this._REGEXP_CACHE.DOUBLE_BY_MAX_DECIMALS[maxDecimals];
+        };
         SharedValidators.validDate = function (control) {
             var value = control.value;
             var date = !value || moment$4.isMoment(value) ? value : moment$4(control.value, DATE_ISO_PATTERN);
@@ -2985,24 +2997,15 @@
             return null;
         };
         SharedValidators.double = function (opts) {
-            var regexpStr;
-            if (opts && isNotNil(opts.maxDecimals)) {
-                if (opts.maxDecimals < 0)
-                    throw new Error("Invalid maxDecimals value: " + opts.maxDecimals);
-                regexpStr = opts.maxDecimals > 1 ? "^[-]?[0-9]+([.,][0-9]{1," + opts.maxDecimals + "})?$" : '^[-]?[0-9]+([.,][0-9])?$';
-            }
-            else {
-                regexpStr = '^[-]?[0-9]+([.,][0-9]*)?$';
-            }
-            var regexp = new RegExp(regexpStr);
+            var regexp = this.getDoubleRegexp(opts === null || opts === void 0 ? void 0 : opts.maxDecimals);
             return function (control) {
                 var value = control.value;
                 if (Number.isNaN(value)) {
                     //console.log("WARN: Getting a NaN value !");
-                    value = null;
+                    return null;
                 }
                 if (isNotNil(value) && value !== '' && !regexp.test(value)) {
-                    return { maxDecimals: true };
+                    return { maxDecimals: { maxDecimals: opts === null || opts === void 0 ? void 0 : opts.maxDecimals } };
                 }
                 return null;
             };
@@ -3095,6 +3098,14 @@
         };
         return SharedValidators;
     }());
+    SharedValidators._REGEXP_CACHE = {
+        DOUBLE_BY_MAX_DECIMALS: {
+            NO_LIMIT: /^[-]?[0-9]+([.,][0-9]*)?$/,
+            1: /^[-]?[0-9]+([.,][0-9])?$/,
+            2: /^[-]?[0-9]+([.,][0-9]{1,2})?$/,
+            3: /^[-]?[0-9]+([.,][0-9]{1,2})?$/,
+        }
+    };
     SharedValidators.I18N_ERROR_KEYS = {
         required: 'ERROR.FIELD_REQUIRED',
         min: 'ERROR.FIELD_MIN',