@reactables/forms 0.7.0-alpha.1 → 0.7.0-alpha.3

package/dist/Helpers/reverseObjectKeys.d.ts

@@ -0,0 +1,2 @@
+import { Form } from '../Models/Controls';
+export declare const reverseObjectKeys: <T>(form: Form<T>) => Form<T>;

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

@@ -1,26 +1,5 @@
 import { Form, FormControl, BaseFormState } from '../../Models/Controls';
-import { FormErrors } from '../../Models/FormErrors';
 export declare const mergeControls: <T>(state: Form<T>, { form, changedControls, removedControls }: BaseFormState<unknown>) => {
-    [x: string]: FormControl<unknown> | {
-        errors: {
-            [x: string]: boolean;
-        };
-        valid: boolean;
-        childrenValid: boolean;
-        pristineValue: unknown;
-        controlRef: import("../..").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;
-    };
+    [x: string]: FormControl<unknown>;
     root?: FormControl<unknown>;
 };

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

@@ -2,5 +2,5 @@ import { Form, BaseForm, FormControl } from '../../Models/Controls';
 import { ControlRef } from '../../Models/ControlRef';
 export declare const mergeRemoveControl: <T>(state: Form<T>, form: BaseForm<T>, controlRef: ControlRef) => {
     [x: string]: FormControl<unknown>;
-    root?: FormControl<T>;
+    root?: FormControl<unknown>;
 };

package/dist/RxForm/RxForm.d.ts

@@ -28,7 +28,7 @@ export interface FormReducers {
     markControlAsUntouched: <T>(state: BaseFormState<T>, payload: ControlRef) => BaseFormState<T>;
     resetControl: <T>(state: BaseFormState<T>, payload: ControlRef) => BaseFormState<T>;
 }
-type CustomReducer = (reducers: FormReducers, state: BaseFormState<unknown>, action: Action<unknown>) => BaseFormState<unknown>;
+export type CustomReducer = (reducers: FormReducers, state: BaseFormState<unknown>, action: Action<unknown>) => BaseFormState<unknown>;
 export interface CustomReducers {
     [key: string]: CustomReducer | {
         reducer: CustomReducer;

package/dist/index.js

@@ -793,6 +793,15 @@ var asyncValidation = function (form, _a) {
     return __assign(__assign({}, form), updatedSelfAndAncestors);
 };
 
+var reverseObjectKeys = function (form) {
+    return Object.keys(form)
+        .reverse()
+        .reduce(function (acc, key) {
+        acc[key] = form[key];
+        return acc;
+    }, {});
+};
+
 var hasErrors$3 = function (errors) {
     return Object.values(errors).some(function (hasError) { return hasError; });
 };
@@ -827,7 +836,8 @@ var mergeBranchErrors = function (form, controlRef) {
         }
         return __assign(__assign({}, acc), (_b = {}, _b[key] = __assign(__assign({}, control), { errors: errors, valid: selfValid && childrenValid, childrenValid: childrenValid }), _b));
     }, {});
-    return __assign(__assign({}, form), errorsMerged);
+    var errorsMergedOrderRestored = reverseObjectKeys(errorsMerged);
+    return __assign(__assign({}, form), errorsMergedOrderRestored);
 };
 
 var isControlValidating = function (control) {
@@ -883,12 +893,7 @@ var mergeErrors = function (form) {
         }
         return __assign(__assign({}, acc), (_b = {}, _b[key] = __assign(__assign({}, control), { errors: errors, valid: selfValid && childrenValid, childrenValid: childrenValid }), _b));
     }, {});
-    var restoredOrder = Object.keys(errorsMerged)
-        .reverse()
-        .reduce(function (acc, key) {
-        acc[key] = errorsMerged[key];
-        return acc;
-    }, {});
+    var restoredOrder = reverseObjectKeys(errorsMerged);
     return restoredOrder;
 };
 
@@ -926,13 +931,14 @@ var mergeRemoveControl = function (state, form, controlRef) {
         }
         return __assign(__assign({}, acc), (_a = {}, _a[key] = __assign(__assign(__assign({}, existingControl), baseControl), { errors: errors, valid: selfValid && childrenValid, childrenValid: childrenValid }), _a));
     }, {});
+    var updatedControlBranchOrderRestored = reverseObjectKeys(updatedControlBranch);
     var descendants = existingBranch.filter(function (control) { return control.controlRef.length > parentRef.length; });
     var removedControls = __assign({}, state);
     descendants.forEach(function (control) {
         delete removedControls[getFormKey(control.controlRef)];
     });
     delete removedControls[getFormKey(controlRef)];
-    return __assign(__assign({}, removedControls), updatedControlBranch);
+    return __assign(__assign({}, removedControls), updatedControlBranchOrderRestored);
 };
 
 var hasErrors = function (errors) {
@@ -976,7 +982,8 @@ var mergeControls = function (state, _a) {
         }
         return __assign(__assign({}, acc), (_a = {}, _a[formKey] = __assign(__assign({}, newControl), { errors: errors, valid: selfValid && childrenValid, childrenValid: childrenValid }), _a));
     }, {});
-    var result = __assign(__assign({}, controlsRemoved), updatedBranch);
+    var orderRestored = reverseObjectKeys(updatedBranch);
+    var result = __assign(__assign({}, controlsRemoved), orderRestored);
     return result;
 };
 

package/package.json

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