@reactables/forms 0.7.0-alpha.14 → 0.7.0-alpha.16

package/dist/Helpers/buildHub2Source.d.ts

@@ -1,4 +1,4 @@
 import { Observable } from 'rxjs';
 import { Action } from '@reactables/core';
 import { BaseFormState } from '../Models/Controls';
-export declare const buildHub2Source: <T, S>(hub1State$: Observable<BaseFormState<T>>) => Observable<Action<T>>;
+export declare const buildHub2Source: <T>(hub1State$: Observable<BaseFormState<T>>) => Observable<Action<T>>;

package/dist/RxForm/RxForm.d.ts

@@ -33,11 +33,13 @@ export type CustomReducer = CustomReducerFunc | {
     reducer: CustomReducerFunc;
     effects?: ((payload?: unknown) => ScopedEffects<unknown>) | Effect<unknown, unknown>[];
 };
-export interface CustomReducers {
-    [key: string]: CustomReducer;
-}
-export interface RxFormOptions<T extends CustomReducers> extends EffectsAndSources {
-    reducers?: T;
+export type CustomReducers<T> = {
+    [key in keyof (T & {
+        [key: string]: CustomReducer;
+    })]: CustomReducer;
+};
+export interface RxFormOptions extends EffectsAndSources {
+    reducers?: CustomReducers<unknown>;
     providers?: RxFormProviders;
     name?: string;
 }
@@ -53,6 +55,8 @@ export interface RxFormProviders {
         [key: string]: ValidatorAsyncFn;
     };
 }
-export declare const build: <T extends CustomReducers>(config: AbstractControlConfig, options?: RxFormOptions<T>) => Reactable<Form<unknown>, { [K in keyof T]: (payload?: any) => void; } & RxFormActions>;
-export declare const load: <T extends CustomReducers>(state: Form<unknown>, options?: RxFormOptions<T>) => Reactable<Form<unknown>, { [K in keyof T]: (payload?: any) => void; } & RxFormActions>;
+export declare const build: <T extends CustomReducers<S>, S>(config: AbstractControlConfig, options?: RxFormOptions) => Reactable<Form<unknown>, { [K in keyof T]: (payload?: any) => void; } & RxFormActions>;
+export declare const load: (state: Form<unknown>, options?: RxFormOptions) => Reactable<Form<unknown>, {
+    [x: string]: (payload?: any) => void;
+} & RxFormActions>;
 export {};

package/dist/index.js

@@ -337,34 +337,28 @@ var getAncestorControls = function (controlRef, form, excludeSelf) {
 };
 
 var UPDATE_DESCENDANT_VALUES = 'UPDATE_DESCENDANT_VALUES';
-var updateDescendants = function (state, _a, providers) {
+var updateDescendantValues = function (form, _a, providers) {
     var _b = _a.payload, controlRef = _b.controlRef, value = _b.value;
-    var descendants = getDescendantControls(controlRef, state.form, true).map(function (control) { return [getFormKey(control.controlRef), control]; });
+    var descendants = getDescendantControls(controlRef, form, true).map(function (control) { return [getFormKey(control.controlRef), control]; });
     var result = descendants.reduce(function (acc, _a) {
-        var _b, _c;
+        var _b;
         var key = _a[0], control = _a[1];
         if (isChildRef(control.controlRef, controlRef)) {
             var childValue = value[control.controlRef.at(-1)];
             var validatorErrors = getErrors(control, childValue, providers);
             var newControl = __assign(__assign({}, control), { value: childValue, validatorErrors: validatorErrors, dirty: !isEqual__default["default"](childValue, control.pristineValue) });
-            acc = {
-                form: __assign(__assign({}, acc.form), (_b = {}, _b[key] = newControl, _b)),
-                changedControls: __assign(__assign({}, acc.changedControls), (_c = {}, _c[newControl.key] = newControl, _c))
-            };
+            acc = __assign(__assign({}, acc), (_b = {}, _b[key] = newControl, _b));
             var configControls = control.config.controls;
             if (configControls) {
-                acc = updateDescendants(acc, {
+                acc = updateDescendantValues(acc, {
                     type: UPDATE_DESCENDANT_VALUES,
                     payload: { controlRef: control.controlRef, value: childValue }
                 }, providers);
             }
         }
         return acc;
-    }, { form: {}, changedControls: {} });
-    return {
-        form: __assign(__assign({}, state.form), result.form),
-        changedControls: __assign({}, result.changedControls)
-    };
+    }, form);
+    return result;
 };
 // Will only update child controls that are present.
 // Use AddControlPayload/RemoveControl action reducers to add/remove control
@@ -393,15 +387,20 @@ var updateValues = function (_a, action, providers, mergeChanges) {
         changedControls: (_c = {}, _c[newControl.key] = newControl, _c)
     };
     var configControls = config.controls;
-    // Update its children
+    // Update its descendants
     if (configControls) {
-        result = updateDescendants(result, {
+        var updatedDescendants = updateDescendantValues(result.form, {
             type: UPDATE_DESCENDANT_VALUES,
             payload: {
                 controlRef: controlRef,
                 value: newValue
             }
         }, providers);
+        var changedDescendantControls = getDescendantControls(controlRef, updatedDescendants).reduce(function (acc, control) {
+            var _a;
+            return (__assign(__assign({}, acc), (_a = {}, _a[control.key] = control, _a)));
+        }, {});
+        result = __assign(__assign({}, result), { form: updatedDescendants, changedControls: __assign(__assign({}, result.changedControls), changedDescendantControls) });
     }
     // Update its Ancestors
     if (controlRef.length) {

package/package.json

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