@arquimedes.co/eureka-forms 2.0.57 → 2.0.59

package/dist/Form/FormFunctions.js

@@ -129,7 +129,7 @@ function stringToDraft(text) {
     return draftStructure;
 }
 export function calcDependencies(steps, customSteps, allSteps, dependencies, values, addDependents) {
-    var _a, _b;
+    var _a, _b, _c;
     if (customSteps === void 0) { customSteps = {}; }
     if (allSteps === void 0) { allSteps = steps; }
     if (dependencies === void 0) { dependencies = {}; }
@@ -140,8 +140,8 @@ export function calcDependencies(steps, customSteps, allSteps, dependencies, val
     if (addDependents === void 0) { addDependents = true; }
     var _loop_1 = function (step) {
         var idDeps = calcStepDeps(step);
-        for (var _d = 0, idDeps_1 = idDeps; _d < idDeps_1.length; _d++) {
-            var idDep = idDeps_1[_d];
+        for (var _e = 0, idDeps_1 = idDeps; _e < idDeps_1.length; _e++) {
+            var idDep = idDeps_1[_e];
             if (dependencies[idDep] === undefined &&
                 (addDependents || allSteps[idDep]))
                 dependencies[idDep] = calcStepDependency(idDep, allSteps, values, customSteps);
@@ -150,8 +150,8 @@ export function calcDependencies(steps, customSteps, allSteps, dependencies, val
                 dependencies[idDep].dependents.push(step);
         }
         if (step.type === StepTypes.ENTITYVALUEPICKER) {
-            for (var _e = 0, _f = __spreadArray(__spreadArray([], step.path, true), step.filters, true); _e < _f.length; _e++) {
-                var dep = _f[_e];
+            for (var _f = 0, _g = __spreadArray(__spreadArray([], step.path, true), step.filters, true); _f < _g.length; _f++) {
+                var dep = _g[_f];
                 if (dep.type !== EntityValueDataTypes.STEP)
                     continue;
                 if ((_a = step.dependencies) === null || _a === void 0 ? void 0 : _a.includes(dep.idStep))
@@ -165,13 +165,13 @@ export function calcDependencies(steps, customSteps, allSteps, dependencies, val
             }
         }
         if (step.type === StepTypes.MAPPER) {
-            var subSteps = calcMapperSubSteps(step, (_b = values.sections[step.idSection]) === null || _b === void 0 ? void 0 : _b[step.id].elements, customSteps);
+            var subSteps = calcMapperSubSteps(step, (_c = (_b = values.sections[step.idSection]) === null || _b === void 0 ? void 0 : _b[step.id]) === null || _c === void 0 ? void 0 : _c.elements, customSteps);
             var hasSubSteps = Object.keys(subSteps).length > 0;
             calcDependencies(hasSubSteps ? subSteps : step.steps, customSteps, __assign(__assign({}, allSteps), subSteps), dependencies, values, hasSubSteps);
         }
     };
-    for (var _i = 0, _c = Object.values(steps); _i < _c.length; _i++) {
-        var step = _c[_i];
+    for (var _i = 0, _d = Object.values(steps); _i < _d.length; _i++) {
+        var step = _d[_i];
         _loop_1(step);
     }
     return dependencies;

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/Element/PagedMapperElement/PagedMapperElement.js

@@ -67,6 +67,7 @@ function PagedMapperElement(_a) {
     var _c = useAppSelector(function (state) { return state.global; }), formStyle = _c.formStyle, postview = _c.postview;
     var totalElements = elements.filter(function (elem) { return !elem.deleted; });
     var position = totalElements.findIndex(function (e) { return e.id == element.id; });
+    var containerRef = React.useRef(null);
     var pagingRef = React.useRef(null);
     var _d = useFormContext(), getValues = _d.getValues, trigger = _d.trigger, handleSubmit = _d.handleSubmit;
     var nextIndex = useMemo(function () {
@@ -93,11 +94,12 @@ function PagedMapperElement(_a) {
     });
     var handleChangePage = useCallback(function (index) { return __awaiter(_this, void 0, void 0, function () {
         var valid, values, nestedValues, _i, _a, _b, key, value_1;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0: return [4 /*yield*/, trigger(undefined, { shouldFocus: true })];
                 case 1:
-                    valid = _c.sent();
+                    valid = _d.sent();
                     /** Imprimir errores si no es valido */
                     if (!valid) {
                         handleErrors();
@@ -115,7 +117,7 @@ function PagedMapperElement(_a) {
                         key: step.id + '-' + element.id,
                         values: nestedValues,
                     }));
-                    location.href = '#' + step.id;
+                    (_c = containerRef.current) === null || _c === void 0 ? void 0 : _c.scrollIntoView({ behavior: 'smooth' });
                     //Updated the nestedValues in the values store.
                     onChange({
                         elements: elements,
@@ -136,7 +138,7 @@ function PagedMapperElement(_a) {
         var _a, _b, _c;
         return (_jsx("div", __assign({ className: widthStats.isMobile
                 ? styles.mobileContainer
-                : styles.container }, { children: _jsxs("div", __assign({ className: styles.contentContainer, style: {
+                : styles.container, ref: containerRef }, { children: _jsxs("div", __assign({ className: styles.contentContainer, style: {
                     width: (size.blockSize + size.spacingSize) *
                         ((_b = (_a = step.style) === null || _a === void 0 ? void 0 : _a.size) !== null && _b !== void 0 ? _b : size.blockNum - 1),
                 } }, { children: [name && (_jsx("div", __assign({ className: styles.titleLbl, style: { color: formStyle.textColor } }, { children: loading ? 'Cargando...' : name + ':' }))), _jsxs("div", __assign({ className: styles.btnsContainer }, { children: [renderElementButtons === null || renderElementButtons === void 0 ? void 0 : renderElementButtons(element), (deletable || !element.isOriginal) && (_jsx("div", __assign({ className: !editable || postview

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.57",
+    "version": "2.0.59",
     "scripts": {
         "start": "react-scripts start",
         "build": "react-scripts build",