@arquimedes.co/eureka-forms 2.0.26 → 2.0.27

package/dist/App/AppFunctions.js

@@ -106,7 +106,7 @@ export function calcRecursiveData(element, newSteps, customSteps) {
         if (custom === null || custom === void 0 ? void 0 : custom.calcRecursiveData) {
             custom.calcRecursiveData(step, element.ids);
         }
-        calcSubSteps(step, function (idStep) { var _a; return (_a = element.ids[idStep]) !== null && _a !== void 0 ? _a : idStep; });
+        calcSubSteps(step.id, newSteps, function (idStep) { var _a; return (_a = element.ids[idStep]) !== null && _a !== void 0 ? _a : idStep; });
     }
 }
 export var mapOriginalValue = function (step, value, values, form) {

package/dist/FormSteps/StepFunctions.d.ts

@@ -8,9 +8,9 @@ export declare const calcStepWidth: (stepSize: 1 | 2 | 3 | 4, size: FormSize) =>
 export declare const calcDefaultValue: (step: FormStep | CBRFormStep) => any;
 export declare const iterateNestedSteps: (idStep: string, steps: Record<string, FormStep>, iteration: (step: FormStep) => void) => void;
 /**
- * Utility function to handle the substeps of a step
+ * Utility function to calc the substeps of a step
  * @param step step to calc the substeps
  * @param idModifier optional modifier for the ids of the substeps and all other properties
- * @returns list of the ids of the direct substeps of the step, if modifier returns modified steps
+ * @returns list of the ids of the substeps of the step, if modifier returns modified steps
  */
-export declare const calcSubSteps: (step: FormStep | CBRFormStep | AYFFormStep, idModifier?: ((idSubStep: string) => string) | undefined) => string[];
+export declare const calcSubSteps: (idStep: string, allSteps: Record<string, FormStep | CBRFormStep | AYFFormStep>, idModifier?: ((idSubStep: string) => string) | undefined) => string[];

package/dist/FormSteps/StepFunctions.js

@@ -1,3 +1,12 @@
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 import { ApiSelectorOptionTypes, ClassifierOptionTypes, EntityValueDataTypes, EntityValueOptionTypes, OptionTypes, StepTypes, } from '../constants/FormStepTypes';
 import CBRFormStepTypes from '../constants/CBRFormStepTypes';
 import AYFFormStepTypes from '../constants/AYFFormStepTypes';
@@ -146,27 +155,30 @@ export var iterateNestedSteps = function (idStep, steps, iteration) {
         }
     }
     else {
-        for (var _b = 0, _c = calcSubSteps(step); _b < _c.length; _b++) {
+        for (var _b = 0, _c = calcSubSteps(step.id, steps); _b < _c.length; _b++) {
             var idSubStep = _c[_b];
             iterateNestedSteps(idSubStep, steps, iteration);
         }
     }
 };
 /**
- * Utility function to handle the substeps of a step
+ * Utility function to calc the substeps of a step
  * @param step step to calc the substeps
  * @param idModifier optional modifier for the ids of the substeps and all other properties
- * @returns list of the ids of the direct substeps of the step, if modifier returns modified steps
+ * @returns list of the ids of the substeps of the step, if modifier returns modified steps
  */
-export var calcSubSteps = function (step, idModifier) {
+export var calcSubSteps = function (idStep, allSteps, idModifier) {
     var _a;
+    var step = allSteps[idStep];
     var subSteps = [];
+    if (!step)
+        return [];
     var handleSteps = function (steps) {
         for (var i = 0; i < steps.length; i++) {
-            var idStep = steps[i];
+            var idSubStep = steps[i];
             if (idModifier)
-                steps[i] = idModifier(idStep);
-            subSteps.push(idStep);
+                steps[i] = idModifier(steps[i]);
+            subSteps.push.apply(subSteps, __spreadArray([idSubStep], calcSubSteps(idSubStep, allSteps, idModifier), false));
         }
     };
     switch (step.type) {

package/package.json

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