myrta-ui 1.1.26 → 1.1.28

package/fesm2020/myrta-ui.mjs

@@ -4256,7 +4256,7 @@ 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') {
+    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 +4264,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;
     }
@@ -17420,8 +17420,13 @@ class FormulaEditorComponent {
             endOffset: 0
         };
         this.searchText = '';
-        this.operatorList = ['+', '-', '*', '/'];
-        this.bracketList = ['(', ')'];
+        this._operatorList = ['+', '-', '*', '/'];
+        this._bracketList = ['(', ')'];
+        this._itemList = [];
+        this._modifiedItemList = {
+            items: {},
+            regExp: new RegExp(''),
+        };
         this.value = '';
         this.visibleValue = '';
         this.isFocused = false;
@@ -17432,8 +17437,6 @@ class FormulaEditorComponent {
         // SAVE STATE
         this.uuid = v4();
         this.fields = [];
-        // TODO items
-        this.items = [];
         this.disabled = false;
         this.readonly = false;
         this.placeholder = '';
@@ -17450,11 +17453,17 @@ class FormulaEditorComponent {
         this.onTouched = () => {
         };
     }
+    set items(items) {
+        const itemsMap = Object.fromEntries(items.map(obj => [obj.label, obj.sysName]));
+        this._itemList = items;
+        this._modifiedItemList.items = itemsMap;
+        this._modifiedItemList.regExp = new RegExp(items.map(s => s.label).join('|'), 'g');
+    }
     get getErrorMessage() {
         return this.invalidMessage || ErrorMessagesEnum[this.errorModel.errorType];
     }
     get filteredList() {
-        return this.items.filter(item => item.label.includes(this.searchText));
+        return this._itemList.filter(item => item.label.includes(this.searchText));
     }
     get getInvalid() {
         return this.errorModel.isError || this.invalid;
@@ -17473,14 +17482,15 @@ class FormulaEditorComponent {
     }
     writeValue(outsideValue) {
         if (outsideValue !== null) {
+            const { 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);
-        this.updateValue(value);
+        const { searchText } = this._transformValue(this._modifiedValue(this._inputValue), false);
+        // this.updateValue(value);
         this.searchText = searchText;
         this._storeCursorPosition();
     }
@@ -17494,9 +17504,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,30 +17526,26 @@ 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(' ');
+        return value.replace(this._modifiedItemList.regExp, match => `{${this._modifiedItemList.items[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._itemList.find(v => clearedItem.includes(v.sysName));
             if (findItem) {
                 visibleValueArray.push(createTag(findItem.label));
                 originalValueArray.push(createTagOutside(findItem.sysName));
             }
-            else if (this.bracketList.find(v => v === clearedItem)) {
+            else if (this._bracketList.find(v => v === clearedItem)) {
                 visibleValueArray.push(createBracket(clearedItem));
                 originalValueArray.push(clearedItem);
             }
-            else if (this.operatorList.find(v => v === clearedItem)) {
+            else if (this._operatorList.find(v => v === clearedItem)) {
                 visibleValueArray.push(createOperator(clearedItem));
                 originalValueArray.push(clearedItem);
             }
@@ -17566,8 +17572,8 @@ class FormulaEditorComponent {
     _checkErrors(valueArray, isInterpretationError) {
         this._disableError();
         this._toggleError(checkBracketErrors(valueArray));
-        this._toggleError(checkDividerErrors(valueArray, this.items));
-        this._toggleError(checkSequenceErrors(valueArray, this.operatorList, this.bracketList));
+        this._toggleError(checkDividerErrors(valueArray, this._itemList));
+        this._toggleError(checkSequenceErrors(valueArray, this._operatorList, this._bracketList));
         this._toggleError(checkInterpretationErrors(isInterpretationError));
     }
     _toggleError(errorModel) {
@@ -17616,9 +17622,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() {
@@ -17636,8 +17642,7 @@ class FormulaEditorComponent {
     }
     clickOut(event) {
         if (!this.eRef.nativeElement.contains(event.target)) {
-            const { value, visibleValue } = this._transformValue(this._inputValue, true);
-            this.updateValue(value);
+            const { visibleValue } = this._transformValue(this._modifiedValue(this._inputValue), true);
             this.updateVisibleValue(visibleValue);
             this.isFocused = false;
             this._detector.detectChanges();
@@ -17651,7 +17656,7 @@ class FormulaEditorComponent {
     }
 }
 FormulaEditorComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: FormulaEditorComponent, deps: [{ token: DOCUMENT }, { token: i0.ChangeDetectorRef }, { token: i0.ElementRef }], target: i0.ɵɵFactoryTarget.Component });
-FormulaEditorComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.4.0", type: FormulaEditorComponent, selector: "mrx-formula-editor", inputs: { fields: "fields", items: "items", disabled: "disabled", readonly: "readonly", placeholder: "placeholder", customClasses: "customClasses", invalid: "invalid", invalidMessage: "invalidMessage", checkInvalid: "checkInvalid" }, outputs: { changed: "changed", blurred: "blurred", modelChange: "modelChange" }, host: { listeners: { "document:click": "clickOut($event)" } }, providers: [{
+FormulaEditorComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.4.0", type: FormulaEditorComponent, selector: "mrx-formula-editor", inputs: { fields: "fields", disabled: "disabled", readonly: "readonly", placeholder: "placeholder", customClasses: "customClasses", invalid: "invalid", invalidMessage: "invalidMessage", checkInvalid: "checkInvalid", items: "items" }, outputs: { changed: "changed", blurred: "blurred", modelChange: "modelChange" }, host: { listeners: { "document:click": "clickOut($event)" } }, providers: [{
             provide: NG_VALUE_ACCESSOR,
             useExisting: forwardRef(() => FormulaEditorComponent),
             multi: true
@@ -17668,8 +17673,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImpor
                     args: [DOCUMENT]
                 }] }, { type: i0.ChangeDetectorRef }, { type: i0.ElementRef }]; }, propDecorators: { fields: [{
                 type: Input
-            }], items: [{
-                type: Input
             }], disabled: [{
                 type: Input
             }], readonly: [{
@@ -17684,6 +17687,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImpor
                 type: Input
             }], checkInvalid: [{
                 type: Input
+            }], items: [{
+                type: Input
             }], inputElement: [{
                 type: ViewChild,
                 args: ['inputElement', { static: true }]