@arquimedes.co/eureka-forms 1.9.38-test → 1.9.40-test

package/dist/@Types/FormStep.d.ts

@@ -106,6 +106,7 @@ export interface Mapper extends GSteps.GBaseStep {
     steps: Record<string, FormStep>;
     required: boolean;
     unitLabel: string;
-    creatable: boolean;
+    creatable?: boolean;
+    deletable?: boolean;
 }
 export {};

package/dist/App.js

@@ -378,6 +378,12 @@ var mapOriginalValues = function (originalValues, form) {
                             }
                         }
                     }
+                    for (var _e = 0, _f = Object.keys(element); _e < _f.length; _e++) {
+                        var idValue_1 = _f[_e];
+                        if (!step.steps[idValue_1]) {
+                            newValues[idValue_1] = element[idValue_1];
+                        }
+                    }
                     mappedElements.push(mappedElement);
                 }
                 newValues[step.id] = mappedElements;

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

@@ -267,8 +267,7 @@ var calcValue = function (step, values, customSteps, value) {
                         var mappedId = element.ids[idStep];
                         if (values[mappedId] !== undefined) {
                             var substep = step.steps[idStep];
-                            var test_1 = calcValue(substep, values, customSteps, values[mappedId]);
-                            newValue[idStep] = test_1;
+                            newValue[idStep] = calcValue(substep, values, customSteps, values[mappedId]);
                         }
                     }
                     mappedValues.push(newValue);
@@ -302,13 +301,14 @@ function stringToDraft(text) {
     return draftStructure;
 }
 function calcDependencies(steps, originalValues, allSteps, dependencies) {
+    var _a;
     if (allSteps === void 0) { allSteps = steps; }
     if (dependencies === void 0) { dependencies = {}; }
-    for (var _i = 0, _a = Object.values(steps); _i < _a.length; _i++) {
-        var step = _a[_i];
+    for (var _i = 0, _b = Object.values(steps); _i < _b.length; _i++) {
+        var step = _b[_i];
         if (step.dependencies) {
-            for (var _b = 0, _c = step.dependencies; _b < _c.length; _b++) {
-                var idDep = _c[_b];
+            for (var _c = 0, _d = step.dependencies; _c < _d.length; _c++) {
+                var idDep = _d[_c];
                 var depStep = allSteps[idDep];
                 if (depStep && dependencies[idDep] === undefined) {
                     dependencies[idDep] = calcStepDependencyValue(depStep, originalValues);
@@ -316,23 +316,37 @@ function calcDependencies(steps, originalValues, allSteps, dependencies) {
             }
         }
         if (step.type === Types.MAPPER) {
-            calcDependencies(step.steps, originalValues, __assign(__assign({}, allSteps), step.steps), dependencies);
+            var newSteps = {};
+            var elements = originalValues[step.id];
+            var _loop_1 = function (element) {
+                for (var _f = 0, _g = Object.keys(step.steps); _f < _g.length; _f++) {
+                    var idSubStep = _g[_f];
+                    var subStep = step.steps[idSubStep];
+                    var mappedId = element.ids[idSubStep];
+                    newSteps[mappedId] = __assign(__assign({}, subStep), { id: mappedId, dependencies: (_a = subStep.dependencies) === null || _a === void 0 ? void 0 : _a.map(function (dep) { var _a; return (_a = element.ids[dep]) !== null && _a !== void 0 ? _a : dep; }) });
+                }
+            };
+            for (var _e = 0, elements_2 = elements; _e < elements_2.length; _e++) {
+                var element = elements_2[_e];
+                _loop_1(element);
+            }
+            calcDependencies(newSteps, originalValues, __assign(__assign({}, allSteps), newSteps), dependencies);
         }
     }
     return dependencies;
 }
 export function calcStepDependencyValue(depStep, originalValues) {
-    var _a;
+    var _a, _b;
     switch (depStep.type) {
         case Types.TEXTAREA: {
             if (depStep.hasTextEditor) {
                 return null;
             }
             else {
-                return originalValues[depStep.id].value;
+                return (_a = originalValues[depStep.id]) === null || _a === void 0 ? void 0 : _a.value;
             }
         }
         default:
-            return (_a = originalValues[depStep.id]) !== null && _a !== void 0 ? _a : null;
+            return (_b = originalValues[depStep.id]) !== null && _b !== void 0 ? _b : null;
     }
 }

package/dist/FormComponents/Step/MapperStep/MaterialMapperStep/Element/PillElementContainer/PillElementContainer.js

@@ -19,12 +19,12 @@ function PillElementContainer(_a) {
             : styles.container }, { children: _jsxs("div", __assign({ className: styles.contentContainer, style: {
                 width: (size.blockSize + size.spacingSize) *
                     (size.blockNum - 1),
-            } }, { children: [_jsxs("div", __assign({ className: styles.titleLbl, style: { color: formStyle.textColor } }, { children: [step.unitLabel + ' ' + (num + 1), ":"] })), _jsx("div", __assign({ className: !editable || postview
+            } }, { children: [_jsxs("div", __assign({ className: styles.titleLbl, style: { color: formStyle.textColor } }, { children: [step.unitLabel + ' ' + (num + 1), ":"] })), step.deletable !== false && (_jsx("div", __assign({ className: !editable || postview
                         ? styles.disabledDeleteBtn
                         : styles.deleteBtn, style: { color: formStyle.textColor }, onClick: function () {
                         if (editable && !postview) {
                             handleDelete === null || handleDelete === void 0 ? void 0 : handleDelete();
                         }
-                    } }, { children: _jsx(DeleteRoundedIcon, { fontSize: "inherit" }) })), children] })) })));
+                    } }, { children: _jsx(DeleteRoundedIcon, { fontSize: "inherit" }) }))), children] })) })));
 }
 export default PillElementContainer;

package/dist/FormComponents/Step/MapperStep/MaterialMapperStep/MaterialMapperStep.js

@@ -65,7 +65,7 @@ function Elements(_a) {
                         elemSteps[newIdStep] = baseStep;
                         newSteps[newIdStep] = baseStep;
                     }
-                    calcRecursiveData(element, elemSteps, deps);
+                    calcRecursiveData(element, elemSteps, deps, others.originalValues);
                 }
                 setDependencyStore(deps);
                 setLocalSteps(__assign(__assign({}, localSteps), newSteps));
@@ -115,11 +115,11 @@ function Elements(_a) {
                     var tempElements = __spreadArray([], elements, true);
                     tempElements[index].deleted = true;
                     onChange(tempElements);
-                } }, others), index)); }), _jsxs("div", __assign({ className: styles.btnContainer }, { children: [_jsx("input", { ref: btnRef, className: styles.hiddenInput }), _jsx(RoundedButton, { disabled: !editable || postview, text: step.addBtnLabel, color: formStyle.primaryContrastColor, backgroundColor: formStyle.primaryColor, fontSize: '1rem', padding: '5px 15px 5px 15px', onClick: function () {
+                } }, others), index)); }), _jsxs("div", __assign({ className: styles.btnContainer }, { children: [_jsx("input", { ref: btnRef, className: styles.hiddenInput }), step.creatable !== false && (_jsx(RoundedButton, { disabled: !editable || postview, text: step.addBtnLabel, color: formStyle.primaryContrastColor, backgroundColor: formStyle.primaryColor, fontSize: '1rem', padding: '5px 15px 5px 15px', onClick: function () {
                             if (editable && !postview) {
                                 handleAddElement();
                             }
-                        } })] }))] })));
+                        } }))] }))] })));
 }
 function MapperStep(props) {
     return (_jsx(Controller, { name: props.step.id, control: props.control, defaultValue: [], rules: {
@@ -132,7 +132,8 @@ function MapperStep(props) {
         } }));
 }
 export default MapperStep;
-function calcRecursiveData(element, newSteps, deps) {
+function calcRecursiveData(element, newSteps, deps, originalValues) {
+    if (originalValues === void 0) { originalValues = {}; }
     for (var _i = 0, _a = Object.keys(newSteps); _i < _a.length; _i++) {
         var idStep = _a[_i];
         var step = newSteps[idStep];
@@ -142,7 +143,7 @@ function calcRecursiveData(element, newSteps, deps) {
                 var newId = element.ids[idDep];
                 if (newId) {
                     step.dependencies[i] = newId;
-                    deps[newId] = calcStepDependencyValue(newSteps[newId], {});
+                    deps[newId] = calcStepDependencyValue(newSteps[newId], originalValues);
                 }
             }
         }
@@ -192,7 +193,7 @@ function calcRecursiveData(element, newSteps, deps) {
                         var newId = element.ids[filter.idStep];
                         if (newId) {
                             filter.idStep = newId;
-                            deps[newId] = calcStepDependencyValue(newSteps[newId], {});
+                            deps[newId] = calcStepDependencyValue(newSteps[newId], originalValues);
                         }
                     }
                 }

package/package.json

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