@reactables/forms 0.5.3-alpha.0 → 0.5.4-alpha.0

package/dist/Reducers/Hub2/mergePushControl.d.ts

@@ -1,5 +1,27 @@
 import { Form, BaseForm } from '../../Models/Controls';
 import { ControlRef } from '../../Models/ControlRef';
+import { FormErrors } from '../../Models/FormErrors';
 export declare const mergePushControl: <T>(state: Form<T>, form: BaseForm<T>, controlRef: ControlRef) => {
+    [x: string]: import("../../Models/Controls").FormControl<unknown> | {
+        errors: {
+            [x: string]: boolean;
+        };
+        valid: boolean;
+        childrenValid: boolean;
+        pristineValue: unknown;
+        controlRef: ControlRef;
+        value: unknown;
+        dirty: boolean;
+        touched: boolean;
+        validatorErrors: FormErrors;
+        config: import("../..").AbstractControlConfig;
+        key: string;
+        asyncValidatorErrors: FormErrors;
+        asyncValidateInProgress: {
+            [key: string]: boolean;
+            [key: number]: boolean;
+        };
+        pending?: boolean;
+    };
     root?: import("../../Models/Controls").FormControl<unknown>;
 };

package/dist/index.js

@@ -875,12 +875,9 @@ var mergePushControl = function (state, form, controlRef) {
     var ancestors = getAncestorControls(controlRef, state)
         .reverse()
         .reduce(function (acc, control, index, arr) {
-        var _a, _b;
+        var _a;
         var formKey = getFormKey(control.controlRef);
         var errors = __assign(__assign({}, form[formKey].validatorErrors), control.asyncValidatorErrors);
-        if (!control.childrenValid)
-            // If the ancestor control's children were not valid, pushing an item won't change its valid status
-            return __assign(__assign({}, acc), (_a = {}, _a[formKey] = __assign(__assign(__assign({}, control), form[formKey]), { errors: errors }), _a));
         var selfValid = !hasErrors(errors);
         var childrenValid = true;
         if (index === 0) {
@@ -889,9 +886,24 @@ var mergePushControl = function (state, form, controlRef) {
                     mergedDescendants[getFormKey(controlRef.concat(newItemIndex))].valid;
         }
         else {
-            childrenValid = control.childrenValid && arr[index - 1].valid;
+            if (Array.isArray(control.config.controls)) {
+                // If control is a FormArray
+                childrenValid = control.value.every(function (item, index) {
+                    var formKey = getFormKey(control.controlRef.concat(index));
+                    var valid = acc[formKey] === undefined ? state[formKey].valid : acc[formKey].valid;
+                    return valid;
+                });
+            }
+            else if (control.config.controls) {
+                // If control is a FormGroup
+                childrenValid = Object.keys(control.value).every(function (childKey) {
+                    var formKey = getFormKey(control.controlRef.concat(childKey));
+                    var valid = acc[formKey] === undefined ? state[formKey].valid : acc[formKey].valid;
+                    return valid;
+                });
+            }
         }
-        return __assign(__assign({}, acc), (_b = {}, _b[formKey] = __assign(__assign(__assign({}, control), form[formKey]), { errors: errors, valid: selfValid && childrenValid, childrenValid: childrenValid }), _b));
+        return __assign(__assign({}, acc), (_a = {}, _a[formKey] = __assign(__assign(__assign({}, control), form[formKey]), { errors: errors, valid: selfValid && childrenValid, childrenValid: childrenValid }), _a));
     }, {});
     var controlBranchUpdated = __assign(__assign({}, ancestors), mergedDescendants);
     return __assign(__assign({}, state), controlBranchUpdated);

package/package.json

@@ -14,7 +14,7 @@
   "author": "David Lai",
   "license": "ISC",
   "dependencies": {
-    "@reactables/core": "^0.5.3-alpha.0",
+    "@reactables/core": "^0.5.4-alpha.0",
     "lodash.isequal": "^4.5.0"
   },
   "peerDependencies": {
@@ -23,5 +23,5 @@
   "devDependencies": {
     "lodash.clonedeep": "^4.5.0"
   },
-  "version": "0.5.3-alpha.0"
+  "version": "0.5.4-alpha.0"
 }