chrv-components 1.10.18 → 1.10.20

package/fesm2022/chrv-components.mjs

@@ -15,7 +15,7 @@ import * as i1$3 from '@angular/forms';
 import { NG_VALIDATORS, Validators, FormControl, ReactiveFormsModule, FormsModule, FormGroup } from '@angular/forms';
 import * as i2$1 from '@angular/material/autocomplete';
 import { MatAutocompleteModule } from '@angular/material/autocomplete';
-import { Observable, map, BehaviorSubject, skip, debounceTime, distinctUntilChanged, startWith, from, mergeMap, toArray, Subject, timer, catchError, forkJoin, take, skipWhile, tap, finalize as finalize$1 } from 'rxjs';
+import { Observable, map, BehaviorSubject, skip, debounceTime, distinctUntilChanged, startWith, Subject, from, mergeMap, toArray, timer, catchError, forkJoin, take, skipWhile, tap, finalize as finalize$1 } from 'rxjs';
 import * as i3$1 from '@angular/material/core';
 import { MatOption } from '@angular/material/core';
 import { trigger, state, style, transition, animate } from '@angular/animations';
@@ -1218,12 +1218,16 @@ class ChrTagSelectComponent extends ChrBaseInputComponent {
          * If this callback returns a different value (by reference (ex: different object)) the entry will be replaced by the new value.
          */
         this.editCallback = null;
+        //Subject used in callback methods to update the value when received.
+        this.editSubject = new Subject();
         /**
          * Callback that will be called BEFORE the value is added with the selected value passed as parameter.
          * If this callback returns null, the entry will NOT be added.
          * This lets you update the value before it's added.
          */
         this.addCallback = null;
+        //Subject used in callback methods to update the value when received.
+        this.addSubject = new Subject();
         /**
          * Callback that will be called during the removal of the value. This will be called with the deleted value passed as parameter.
          */
@@ -1249,35 +1253,32 @@ class ChrTagSelectComponent extends ChrBaseInputComponent {
         this.addFromText = (event) => {
             if (this.acceptText && this.textInputValue.trim()) {
                 const value = this.addCallback
-                    ? this.addCallback(this.textInputValue)
+                    ? this.addCallback(this.textInputValue, this.addSubject)
                     : this.textInputValue;
                 if (this.addCallback && (value === null || value === undefined)) {
                     this.textInputValue = '';
                     return;
                 }
-                this.value = [...(this.value ?? []), value];
-                this.textInputValue = '';
-                this.onValueChange(this.value);
+                this.addSubject.next(value);
             }
         };
         this.add = (event) => {
-            const value = this.addCallback ? this.addCallback(event) : event;
+            const value = this.addCallback
+                ? this.addCallback(event, this.addSubject)
+                : event;
             if (this.addCallback && (value === null || value === undefined)) {
                 this.textInputValue = '';
                 return;
             }
-            if (!this.value?.find((v) => v == value)) {
-                this.value = [...(this.value ?? []), value];
-            }
             this.textInputValue = '';
-            this.onValueChange(this.value);
+            this.addSubject.next(value);
         };
         this.edit = (entry) => {
             //If no callback, return;
             if (this.editCallback === undefined || this.editCallback === null)
                 return;
             //Call the callback and retrive it's return value
-            const res = this.editCallback(entry);
+            const res = this.editCallback(entry, this.editSubject);
             //If the callback returns null, we remove the value.
             if (res === null && this.value !== null) {
                 this.value = this.value?.filter((v) => v != entry);
@@ -1285,13 +1286,11 @@ class ChrTagSelectComponent extends ChrBaseInputComponent {
                 return this.onValueChange(this.value);
             }
             //If the callback returns a different value (different by reference (ex: different object)), we replace the edited entry by the returned entry.
-            if (entry != res) {
-                const index = this.value?.indexOf(entry);
-                this.value[index] = res;
-                return this.onValueChange(this.value);
-            }
-            this.value[this.value.indexOf(entry)] = entry;
-            return this.onValueChange(this.value);
+            // if (entry != res) {
+            return this.editSubject.next(res);
+            // }
+            // this.value![this.value!.indexOf(entry)] = entry;
+            // return this.onValueChange(this.value);
         };
         this.registerFilters = () => {
             this.filteredModelOptions = this.values.pipe(startWith(''), map((value) => this._filterModel(this.textInputValue || -1)), map((values) => {
@@ -1355,6 +1354,19 @@ class ChrTagSelectComponent extends ChrBaseInputComponent {
         this.registerFilters();
         if (this.acceptText === null)
             this.acceptText = this.display === null && this.data === null;
+        //Register subject listeners
+        this.addSubject.subscribe((entry) => {
+            if (!this.value?.find((v) => v == entry)) {
+                this.value = [...(this.value ?? []), entry];
+                this.onValueChange(this.value);
+            }
+        });
+        this.editSubject.subscribe((entry) => {
+            const index = this.value?.indexOf(entry);
+            this.value[index] = entry;
+            this.value = [...(this.value ?? [])];
+            return this.onValueChange(this.value);
+        });
     }
     writeValue(obj) {
         super.writeValue(obj);