@arquimedes.co/eureka-forms 1.9.46 → 1.9.47

package/dist/FormComponents/Form/ColumnForm/ColumnForm.js

@@ -94,7 +94,7 @@ function ColumnForm(_a) {
         return _jsx("div", {});
     }
     var onSubmit = function (token) { return __awaiter(_this, void 0, void 0, function () {
-        var valid, values, newValues, _i, _a, idStep, step, payload, url, resp, _b, error_1;
+        var valid, values, newValues, _i, _a, idStep, payload, url, resp, _b, error_1;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -116,8 +116,7 @@ function ColumnForm(_a) {
                     newValues = {};
                     for (_i = 0, _a = Object.keys(values); _i < _a.length; _i++) {
                         idStep = _a[_i];
-                        step = form.steps[idStep];
-                        newValues[idStep] = calcValue(step, values, customSteps);
+                        newValues[idStep] = calcValue(idStep, form.steps, values, customSteps);
                     }
                     if (!customSend) return [3 /*break*/, 4];
                     return [4 /*yield*/, customSend(newValues, reload)];
@@ -220,14 +219,15 @@ function calcNextSection(form, idSection, sections) {
         }
     }
 }
-var calcValue = function (step, values, customSteps, value) {
-    var _a, _b, _c;
-    if (value === void 0) { value = values[(_a = step === null || step === void 0 ? void 0 : step.id) !== null && _a !== void 0 ? _a : '']; }
+var calcValue = function (idStep, steps, values, customSteps, value) {
+    var _a, _b;
+    if (value === void 0) { value = values[idStep]; }
+    var step = steps[idStep];
     if (!step)
-        return;
+        return value;
     var custom = customSteps[step === null || step === void 0 ? void 0 : step.type];
     if (custom !== undefined) {
-        return (_c = (_b = custom.calcValue) === null || _b === void 0 ? void 0 : _b.call(custom, step, value)) !== null && _c !== void 0 ? _c : value;
+        return (_b = (_a = custom.calcValue) === null || _a === void 0 ? void 0 : _a.call(custom, step, value)) !== null && _b !== void 0 ? _b : value;
     }
     else {
         switch (step === null || step === void 0 ? void 0 : step.type) {
@@ -264,12 +264,11 @@ var calcValue = function (step, values, customSteps, value) {
                     var newValue = {
                         id: element.id,
                     };
-                    for (var _d = 0, _e = Object.keys(step.steps); _d < _e.length; _d++) {
-                        var idStep = _e[_d];
-                        var mappedId = element.ids[idStep];
+                    for (var _c = 0, _d = Object.keys(step.steps); _c < _d.length; _c++) {
+                        var idStep_1 = _d[_c];
+                        var mappedId = element.ids[idStep_1];
                         if (values[mappedId] !== undefined) {
-                            var substep = step.steps[idStep];
-                            newValue[idStep] = calcValue(substep, values, customSteps, values[mappedId]);
+                            newValue[idStep_1] = calcValue(idStep_1, step.steps, values, customSteps, values[mappedId]);
                         }
                     }
                     mappedValues.push(newValue);

package/package.json

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