@sumaris-net/ngx-components 2.2.1-rc1 → 2.2.1-rc3

package/fesm2020/sumaris-net.ngx-components.mjs

@@ -4216,33 +4216,44 @@ function addValueInArray(arrayControl, createControl, equals, isEmpty, value, op
  * @param values
  */
 function initArrayControlsFromValues(formArray, createControl, defaultValues, options) {
-    let hasChanged = false;
+    if (formArray.length === 0 && (!defaultValues || defaultValues.length === 0))
+        return false; // No changes need
+    const disabled = formArray.disabled;
     while (formArray.length > 0) {
         formArray.removeAt(formArray.length - 1, options);
-        hasChanged = true;
     }
     (defaultValues || []).forEach(value => {
         const control = createControl(value);
+        // Apply parent disabled state, before to push it into the array
+        // This is need to avoid parent form to be enabled, after calling initArrayControlsFromValues()
+        if (disabled && control.enabled)
+            control.disable({ emitEvent: false });
+        else if (!disabled && control.disabled)
+            control.enable({ emitEvent: false });
         formArray.push(control, options);
-        hasChanged = true;
     });
-    return hasChanged;
+    return true; // has some changes
 }
 function resizeArray(arrayControl, createControl, length, options) {
-    const hasChanged = arrayControl.length !== length;
-    // Increase size
-    if (arrayControl.length < length) {
-        while (arrayControl.length < length) {
-            arrayControl.push(createControl(), options);
-        }
-    }
-    // Or reduce
-    else if (arrayControl.length > length) {
-        while (arrayControl.length > length) {
-            arrayControl.removeAt(arrayControl.length - 1, options);
-        }
+    if (arrayControl.length === length)
+        return false; // No changes need
+    const disabled = this.formArray.disabled;
+    // Reduce size
+    while (arrayControl.length > length) {
+        arrayControl.removeAt(arrayControl.length - 1, options);
     }
-    return hasChanged;
+    // Increase size
+    while (arrayControl.length < length) {
+        const control = createControl();
+        // Apply parent disabled state, before to push it into the array
+        // This is need to avoid parent form to be enabled, after calling resizeArray()
+        if (disabled && control.enabled)
+            control.disable({ emitEvent: false });
+        else if (!disabled && control.disabled)
+            control.enable({ emitEvent: false });
+        arrayControl.push(control, options);
+    }
+    return true; // has some changes
 }
 function removeValueInArray(arrayControl, isEmpty, index) {
     arrayControl.removeAt(index);
@@ -4621,7 +4632,20 @@ class AppFormArray extends UntypedFormArray {
     }
     patchValue(values, options) {
         if (this.options?.resizeStrategy === 'recreate') {
-            initArrayControlsFromValues(this, this.createControl, values, options);
+            const disabled = this.disabled;
+            // Clean all
+            this.resize(0, { emitEvent: options?.emitEvent });
+            // Recreate each control, with a default value
+            (values || []).forEach(value => {
+                const control = this.createControl(value);
+                // Apply parent disabled state, before to push it into the array
+                // This is need to avoid parent form to be enabled, after calling AppFormArray.patchValue() (e.g. in table's row validator)
+                if (disabled && control.enabled)
+                    control.disable({ emitEvent: false });
+                else if (!disabled && control.disabled)
+                    control.enable({ emitEvent: false });
+                this.push(control, options);
+            });
         }
         else {
             this.resize(values?.length || 0, { emitEvent: false });
@@ -4631,28 +4655,21 @@ class AppFormArray extends UntypedFormArray {
     resize(length, options) {
         if (this.length === length)
             return; // Nothing to do
-        const enabled = this.enabled; // Save enabled here, because update can occur from resizeArray()
-        // Increase size
-        if (this.length < length) {
-            while (this.length < length) {
-                this.push(this.createControl(), { emitEvent: false /*will be done just after, if changes*/ });
-            }
-        }
-        // Or reduce
-        else {
-            while (this.length > length) {
-                this.removeAt(this.length - 1, { emitEvent: false /*will be done just after, if changes*/ });
-            }
-        }
-        // Restore initial status
-        // This is a workaround, because push and removeAt can have changed the array status
-        if (this.enabled !== enabled) {
-            if (enabled) {
-                this.enable(options);
-            }
-            else {
-                this.disable(options);
-            }
+        const disabled = this.disabled; // Save enabled here, because update can occur from resizeArray()
+        // Reduce
+        while (this.length > length) {
+            this.removeAt(this.length - 1, { emitEvent: options?.emitEvent });
+        }
+        // Or increase size
+        while (this.length < length) {
+            const control = this.createControl();
+            // Apply parent disabled state, before to push it into the array
+            // This is need to avoid parent form to be enabled, after calling AppFormArray.patchValue() (e.g. in table's row validator)
+            if (disabled && control.enabled)
+                control.disable({ emitEvent: false });
+            else if (!disabled && control.disabled)
+                control.enable({ emitEvent: false });
+            this.push(control, options);
         }
     }
     disable(opts) {
@@ -18988,7 +19005,7 @@ class SharedModule {
             ngModule: SharedModule,
             providers: [
                 { provide: ENVIRONMENT, useValue: environment },
-                { provide: StorageService, useClass: StorageService, deps: [ENVIRONMENT] },
+                // { provide: StorageService, useClass: StorageService, deps: [ENVIRONMENT]},
                 { provide: APP_STORAGE, useExisting: StorageService },
                 StorageService,
                 ProgressBarService,