onshore-forms 0.0.51 → 0.0.53

package/fesm2020/onshore-forms.mjs

@@ -173,13 +173,13 @@ class OnshoreFormsService {
                 }
                 else {
                     const defaultValue = defaultValues?.find(value => value.name === subitem.name)?.value;
-                    console.log("OSF - SET DEFAULT", defaultValue);
+                    if (defaultValue)
+                        subitem.default = defaultValue.value;
                     formControls[subitem.name] = new FormControl(defaultValue ?? (subitem.default !== undefined ? subitem.default : ''), {
                         validators: subitem.validators || [],
                         updateOn: 'change'
                     });
                     formControls[subitem.name].updateValueAndValidity({ onlySelf: false, emitEvent: true });
-                    console.log("OSF - FORM CONTROL VAL", formControls[subitem.name], formControls[subitem.name].value);
                 }
             });
         }
@@ -187,6 +187,7 @@ class OnshoreFormsService {
         formGroup.setParent(formArray);
         formArray.push(formGroup);
         this.subscribeNestedFormGroup(formGroup);
+        return formArray;
     }
     removeFormArrayItem(form, index) {
         form.removeAt(index);
@@ -416,8 +417,8 @@ class OnshoreFormItemContainer {
         this.onWindowResize();
     }
     ngOnChanges(changes) {
-        const previousValue = changes['formTemplate'].previousValue;
-        const currentValue = changes['formTemplate'].currentValue;
+        const previousValue = changes['formTemplate']?.previousValue;
+        const currentValue = changes['formTemplate']?.currentValue;
         if (currentValue) {
             if (previousValue?.enabled !== currentValue?.enabled) {
                 this.enabled(currentValue?.enabled);
@@ -921,7 +922,7 @@ class OnshoreFormDropdownItemComponent {
         this.cdr.markForCheck();
     }
     ngOnInit() {
-        if (this.ngControl.control?.value == '' && this.formTemplate.default != undefined && !this.multiple) {
+        if ((!this.ngControl.control?.value || this.ngControl.control?.value == '' || this.ngControl.control?.value == undefined) && !this.multiple) {
             this.ngControl.control?.setValue(this.formTemplate.default);
             this.cdr.markForCheck();
         }
@@ -931,13 +932,10 @@ class OnshoreFormDropdownItemComponent {
     }
     ngOnChanges(changes) {
         const currentOptions = changes['options']?.currentValue ?? changes['formTemplate']?.currentValue?.options;
-        const previousOptions = changes['options']?.previousValue ?? changes['formTemplate']?.previousValue?.options;
+        //const previousOptions =  changes['options']?.previousValue ?? changes['formTemplate']?.previousValue?.options;
         if (!this.options && currentOptions) {
             this.options = currentOptions;
         }
-        if (currentOptions?.length > 0 && currentOptions != previousOptions && !this.multiple) {
-            this.ngControl.control?.setValue(this.options[0]?.value);
-        }
         this.cdr.markForCheck();
     }
 }