chrv-components 1.11.44 → 1.11.46

package/fesm2022/chrv-components.mjs

@@ -1346,7 +1346,6 @@ class ChrBaseInputComponent {
         if (this.control() != null) {
             this.control().valueAccessor = this;
         }
-        this.value.subscribe((v) => console.log(`[BaseInput] Value changed to: ${v}`));
         effect(() => {
             //this.displayValue.set(this.value());
         });
@@ -1388,6 +1387,7 @@ class ChrBaseInputComponent {
      */
     ngOnDestroy() {
         this.valueSubject?.unsubscribe();
+        this.displayValueSubject.unsubscribe();
     }
     writeValue(obj) {
         this.value.set(obj);
@@ -1511,8 +1511,8 @@ class ChrSearchSelectComponent extends ChrBaseInputComponent {
             if (this.acceptText() && this.value()?.trim()) {
                 const addCallback = this.addCallback();
                 const value = addCallback
-                    ? addCallback(this.value, this.addSubject)
-                    : this.value;
+                    ? addCallback(this.value(), this.addSubject)
+                    : this.value();
                 if (this.addCallback() && (value === null || value === undefined)) {
                     this.value.set('');
                     return;
@@ -1550,15 +1550,14 @@ class ChrSearchSelectComponent extends ChrBaseInputComponent {
         super.ngOnInit();
         this.registerFilters();
         this.addSubject.subscribe((entry) => {
-            if (this.value != entry) {
-                this.value.set(entry);
-                this.onValueChange(this.value);
+            if (this.value() != entry) {
+                this.onValueChange(this.value());
             }
         });
         // Only when the value is valid, we override the display value with the value
         // We need to avoid setting it when the value is set to null because it would
         // Remove the user's input a few milliseconds after he starts typing to replace a value
-        this.valueSubject.subscribe((v) => {
+        this.value.subscribe((v) => {
             if (v !== null && v !== undefined) {
                 this.displayValue.set(v);
             }
@@ -1807,15 +1806,17 @@ class ChrTagSelectComponent extends ChrBaseInputComponent {
             //Call the callback and retrive it's return value
             const res = editCallback(entry, this.editSubject);
             //If the callback returns null, we remove the value.
-            if (res === null && this.value !== null) {
+            if (res === null && this.value() !== null) {
                 this.remove(entry);
             }
+            if (entry == res) {
+                return this.editSubject.next(res);
+            }
             //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) {
-            return this.editSubject.next(res);
-            // }
-            // this.value![this.value!.indexOf(entry)] = entry;
-            // return this.onValueChange(this.value);
+            this.value.update((value) => {
+                value[value.indexOf(entry)] = res;
+                return [...(value ?? [])];
+            });
         };
         this.registerFilters = () => {
             this.filteredModelOptions = this.values.pipe(startWith(''), combineLatestWith(this.data$), map((value) => this._filterModel(this.textInputValue() || -1)), map((values) => {
@@ -1890,10 +1891,9 @@ class ChrTagSelectComponent extends ChrBaseInputComponent {
                 .includes(input.trim().toLowerCase());
         };
         this.addSubject.subscribe((entry) => {
-            console.log(`[TagSelect] Adding value:`, entry, this.value);
             if (!this.value()?.find((v) => v == entry)) {
                 this.value.set([...(this.value() ?? []), entry]);
-                this.onValueChange(this.value());
+                //this.onValueChange(this.value());
             }
         });
         this.editSubject.subscribe((entry) => {
@@ -1902,7 +1902,7 @@ class ChrTagSelectComponent extends ChrBaseInputComponent {
                 value[index] = entry;
                 return [...(value ?? [])];
             });
-            return this.onValueChange(this.value());
+            //return this.onValueChange(this.value());
         });
         effect(() => {
             this.data$.next(this.data() || []);
@@ -1912,31 +1912,15 @@ class ChrTagSelectComponent extends ChrBaseInputComponent {
         super.ngOnInit();
         //console.log(this.value);
         this.registerFilters();
-        // if (this.acceptText() === null)
-        //   //Register subject listeners
-        //   this.addSubject.subscribe((entry) => {
-        //     console.log(`[TagSelect] Adding value:`, entry);
-        //     if (!this.value?.find((v: any) => 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);
     }
     remove(value) {
-        if (this.value !== null)
+        if (this.value() !== null)
             this.value.set(this.value()?.filter((v) => v != value));
         if (this.value()?.length === 0)
             this.value.set(null);
-        this.onValueChange(this.value());
         this.removeCallback()?.(value);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.0.6", ngImport: i0, type: ChrTagSelectComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }