@arquimedes.co/eureka-forms 2.0.58 → 2.0.60

package/dist/Form/FormTypes/ColumnForm/ColumnForm.js

@@ -51,10 +51,14 @@ import styles from './ColumnForm.module.css';
 import React from 'react';
 import Terms from '../../Terms/Terms';
 import { useFormContext } from 'react-hook-form';
-import { useAppSelector } from '../../../hooks';
+import { useAppDispatch, useAppSelector } from '../../../hooks';
 import Section from '../../Section/Section';
 import CustomContext from '../../../Contexts/CustomContext';
 import CustomBtn from '../../../Shared/CustomBtn/CustomBtn';
+import FormContext from '../../../Contexts/FormContext';
+import { addPagedValues } from '../../../States/SiteSlice';
+import { getAppState } from '../../../Utils/store';
+import { IdFormContext } from '../../../App/App';
 function ColumnForm(_a) {
     var _this = this;
     var onSubmit = _a.onSubmit, customSubmitBtns = _a.customSubmitBtns;
@@ -62,14 +66,18 @@ function ColumnForm(_a) {
     var _c = useAppSelector(function (state) { return state.global; }), postview = _c.postview, editable = _c.editable, formStyle = _c.formStyle;
     var _d = useFormContext(), trigger = _d.trigger, getValues = _d.getValues, handleSubmit = _d.handleSubmit;
     var sendLabel = useContext(CustomContext).sendLabel;
+    var form = useContext(FormContext);
+    var dispatch = useAppDispatch();
+    var idForm = useContext(IdFormContext);
     var previous = useAppSelector(function (state) { return state.site.previousSections; });
     var next = useAppSelector(function (state) { return state.site.nextSections; });
+    var idCurrent = useAppSelector(function (state) { return state.site.idCurrentSection; });
     /** Esto se usa para no tener que escuchar todo el tiempo los errores del formulario */
     var handleErrors = handleSubmit(function () { }, function (errors) {
         console.error('Errors:', errors);
     });
     var submit = useCallback(function () { return __awaiter(_this, void 0, void 0, function () {
-        var valid, values;
+        var valid, values, state;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -82,8 +90,15 @@ function ColumnForm(_a) {
                         handleErrors();
                         return [2 /*return*/, setLoading(false)];
                     }
-                    return [4 /*yield*/, onSubmit(getValues())];
+                    values = getValues();
+                    if (!idCurrent) return [3 /*break*/, 3];
+                    return [4 /*yield*/, dispatch(getAppState({ idForm: idForm })).unwrap()];
                 case 2:
+                    state = _a.sent();
+                    addPagedValues(form.steps, values, state.site.values.sections[idCurrent]);
+                    _a.label = 3;
+                case 3: return [4 /*yield*/, onSubmit(values)];
+                case 4:
                     values = _a.sent();
                     setLoading(false);
                     return [2 /*return*/, values];

package/dist/Form/FormTypes/StepperForm/StepperForm.js

@@ -58,6 +58,7 @@ import { getAppState } from '../../../Utils/store';
 import { IdFormContext } from '../../../App/App';
 import CustomBtn from '../../../Shared/CustomBtn/CustomBtn';
 import FormContext from '../../../Contexts/FormContext';
+import { addPagedValues } from '../../../States/SiteSlice';
 function StepperForm(_a) {
     var _this = this;
     var _b, _c;
@@ -108,6 +109,9 @@ function StepperForm(_a) {
                     values = state.site.previousSections.reduce(function (v, idSection) { return (__assign(__assign({}, v), state.site.values.sections[idSection])); }, {});
                     /** Add the current section's values */
                     values = __assign(__assign({}, values), getValues());
+                    if (idCurrent) {
+                        addPagedValues(form.steps, values, state.site.values.sections[idCurrent]);
+                    }
                     return [4 /*yield*/, onSubmit(values)];
                 case 3:
                     response = _a.sent();

package/dist/FormSteps/MapperStep/MaterialMapperStep/MaterialMapperStep.js

@@ -110,10 +110,11 @@ function MapperStep(props) {
     var _a = useFormStep(step, {
         defaultValue: { elements: [], page: 0 },
         rules: {
-            validate: function (array) {
+            validate: function (_a) {
+                var elements = _a.elements;
                 return !step.required ||
                     (step.required &&
-                        array.filter(function (elem) { return !elem.deleted; }).length > 0);
+                        elements.filter(function (elem) { return !elem.deleted; }).length > 0);
             },
         },
     }), ref = _a.ref, value = _a.value, onChange = _a.onChange, error = _a.error;

package/dist/States/SiteSlice.d.ts

@@ -92,3 +92,4 @@ export declare const focusStep: import("@reduxjs/toolkit").ActionCreatorWithOpti
     values: Record<string, any>;
 }, "site/updateNestedValues">;
 export default SiteSlice;
+export declare function addPagedValues(steps: Record<string, FormStep>, values: Record<string, any>, original: Record<string, any>, path?: string): void;

package/dist/States/SiteSlice.js

@@ -144,7 +144,7 @@ export var SiteSlice = createSlice({
 });
 export var focusStep = (_a = SiteSlice.actions, _a.focusStep), clearDependency = _a.clearDependency, setStepDependency = _a.setStepDependency, addStepsDependencies = _a.addStepsDependencies, setEmptyDependency = _a.setEmptyDependency, handlePrevious = _a.handlePrevious, handleNext = _a.handleNext, updateNestedValues = _a.updateNestedValues;
 export default SiteSlice;
-function addPagedValues(steps, values, original, path) {
+export function addPagedValues(steps, values, original, path) {
     if (path === void 0) { path = ''; }
     for (var _i = 0, _a = Object.values(steps); _i < _a.length; _i++) {
         var step = _a[_i];

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arquimedes.co/eureka-forms",
     "repository": "git://github.com/Arquimede5/Eureka-Forms.git",
-    "version": "2.0.58",
+    "version": "2.0.60",
     "scripts": {
         "start": "react-scripts start",
         "build": "react-scripts build",