myrta-ui 1.1.25 → 1.1.27

package/fesm2020/myrta-ui.mjs

@@ -4256,7 +4256,10 @@ const getErrorMessageHelper = (key, invalidMessages, messages, params) => {
 
 const requiredValidation = (value, validations, key, invalidMessages) => {
     const result = { isValid: true, message: null };
-    if (Array.isArray(value) && validations.type !== 'single') {
+    console.log(validations);
+    console.log(key);
+    console.log();
+    if (Array.isArray(value) && validations.type !== 'single' && validations[key]) {
         value.forEach((field, idx) => {
             if ((field === '' || field === null || field === undefined)) {
                 result.message = getErrorMessageHelper(key, invalidMessages, validations.messages);
@@ -4264,11 +4267,11 @@ const requiredValidation = (value, validations, key, invalidMessages) => {
             }
         });
     }
-    else if (Array.isArray(value) && validations.type === 'single' && value.length === 0) {
+    else if (Array.isArray(value) && validations.type === 'single' && value.length === 0 && validations[key]) {
         result.message = getErrorMessageHelper(key, invalidMessages, validations.messages);
         result.isValid = false;
     }
-    else if (String(value) === '' || String(value) === 'false' || value === null || value === undefined || String(value) === '<p><br></p>') {
+    else if ((String(value) === '' || String(value) === 'false' || value === null || value === undefined || String(value) === '<p><br></p>') && validations[key]) {
         result.message = getErrorMessageHelper(key, invalidMessages, validations.messages);
         result.isValid = false;
     }
@@ -4315,7 +4318,7 @@ const minLengthValidation = (value, validations, key, invalidMessages) => {
 
 const minValueValidation = (value, validations, key, invalidMessages) => {
     const result = { isValid: true, message: null };
-    if (parseInt(value) > Number(validations[key])) {
+    if (parseInt(value) < Number(validations[key])) {
         result.message = getErrorMessageHelper(key, invalidMessages, validations.messages, Number(validations[key]));
         result.isValid = false;
     }
@@ -4324,7 +4327,7 @@ const minValueValidation = (value, validations, key, invalidMessages) => {
 
 const maxValueValidation = (value, validations, key, invalidMessages) => {
     const result = { isValid: true, message: null };
-    if (parseInt(value) < Number(validations[key])) {
+    if (parseInt(value) > Number(validations[key])) {
         result.message = getErrorMessageHelper(key, invalidMessages, validations.messages, Number(validations[key]));
         result.isValid = false;
     }
@@ -17473,13 +17476,14 @@ class FormulaEditorComponent {
     }
     writeValue(outsideValue) {
         if (outsideValue !== null) {
+            const { value, visibleValue } = this._transformValue(this._modifiedValue(outsideValue));
             this.value = outsideValue;
-            this.visibleValue = this._transformValue(this._modifiedValue(outsideValue)).visibleValue;
+            this.visibleValue = visibleValue;
             this._detector.detectChanges();
         }
     }
     onInput(event) {
-        const { value, searchText } = this._transformValue(this._inputValue, false);
+        const { value, searchText } = this._transformValue(this._modifiedValue(this._inputValue), false);
         this.updateValue(value);
         this.searchText = searchText;
         this._storeCursorPosition();
@@ -17494,9 +17498,9 @@ class FormulaEditorComponent {
     }
     insertTag(whiteListItem) {
         this._restoreCursorPosition(this.inputElement.nativeElement);
-        this._insertPositionText(whiteListItem.label);
+        this._insertPositionText(`{${whiteListItem.sysName}}`);
         setTimeout(() => {
-            const { value, visibleValue } = this._transformValue(this._inputValue, false);
+            const { value, visibleValue } = this._transformValue(this._modifiedValue(this._inputValue), false);
             this.updateValue(value);
             this.updateVisibleValue(visibleValue);
         });
@@ -17516,21 +17520,20 @@ class FormulaEditorComponent {
         this.onTouched();
     }
     _modifiedValue(value) {
-        const clearedValue = value.trim().split(' ').filter(e => e !== '');
-        return clearedValue.map(v => {
-            const findItem = this.items.find(w => `{${w.sysName}}` === v);
-            return findItem ? findItem.label : v;
-        }).join(' ');
+        const labelsMap = Object.fromEntries(this.items.map(obj => [obj.label, obj.sysName]));
+        const str = this.items.map(s => s.label);
+        const reg = new RegExp(str.join('|'), 'g');
+        return value.replace(reg, match => `{${labelsMap[match]}}`);
     }
     _transformValue(content, analise = false) {
-        const valueArray = content.split(/[\s\u00A0]+/).filter(e => e !== '');
+        const valueArray = content.split(/[\s\u00A0]+/).filter(Boolean);
         const visibleValueArray = [];
         const originalValueArray = [];
         let isInterpretationError = false;
         let searchText = '';
         valueArray.forEach((item) => {
             const clearedItem = item.trim();
-            const findItem = this.items.find(v => clearedItem.includes(v.label));
+            const findItem = this.items.find(v => clearedItem.includes(v.sysName));
             if (findItem) {
                 visibleValueArray.push(createTag(findItem.label));
                 originalValueArray.push(createTagOutside(findItem.sysName));
@@ -17557,6 +17560,8 @@ class FormulaEditorComponent {
         if (analise) {
             this._checkErrors(originalValueArray, isInterpretationError);
         }
+        console.log(visibleValueArray);
+        console.log(originalValueArray);
         return {
             value: originalValueArray.join(' '),
             visibleValue: visibleValueArray.join(' '),
@@ -17616,9 +17621,9 @@ class FormulaEditorComponent {
         }
         this._selection = document.getSelection();
         if (this._selection) {
-            this._selection.removeAllRanges();
-            this._selection.addRange(this._range);
-            element.focus();
+            // this._selection.removeAllRanges();
+            // this._selection.addRange(this._range);
+            // element.focus();
         }
     }
     _placeCaretAtEnd() {
@@ -17635,13 +17640,27 @@ class FormulaEditorComponent {
         });
     }
     clickOut(event) {
+        // console.dir(event);
+        // console.log(this._modifiedValue(this._inputValue));
         if (!this.eRef.nativeElement.contains(event.target)) {
-            const { value, visibleValue } = this._transformValue(this._inputValue, true);
-            this.updateValue(value);
+            const { value, visibleValue } = this._transformValue(this._modifiedValue(this._inputValue), true);
+            //
+            // this.updateValue(value);
             this.updateVisibleValue(visibleValue);
+            //
             this.isFocused = false;
             this._detector.detectChanges();
         }
+        // if (!this.eRef.nativeElement.contains(event.target)) {
+        //   console.log(this._inputValue);
+        //   const {value, visibleValue} = this._transformValue(this._inputValue, true);
+        //
+        //   this.updateValue(value);
+        //   this.updateVisibleValue(visibleValue);
+        //
+        //   this.isFocused = false;
+        //   this._detector.detectChanges();
+        // }
     }
     registerOnChange(fn) {
         this.onChange = fn;