@arquimedes.co/eureka-forms 1.9.71-test → 1.9.73-test

package/dist/App.d.ts

@@ -40,6 +40,7 @@ export interface CustomStep {
     componentProps?: Record<string, any>;
     component: ReactNode;
     calcValue?: (step: any, value: any) => any;
+    calcDependencyValue?: (step: any, value: any) => any;
 }
 declare function App({ apiKey, domain, preview, partial, formData, postview, editable, isWidget, internal, valuesData, customSend, customSteps, classifiers, handleConfirmed, ...others }: AppProps): JSX.Element;
 export default App;

package/dist/App.js

@@ -397,6 +397,7 @@ var mapOriginalValues = function (originalValues, form) {
                     var mappedElement = {
                         id: idElement,
                         ids: {},
+                        value: element.value,
                     };
                     for (var _d = 0, _e = Object.keys(step.steps); _d < _e.length; _d++) {
                         var idStep = _e[_d];

package/dist/FormComponents/Form/ColumnForm/ColumnForm.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="react" />
 import { FormComponentProps } from '../Form';
+import { CustomStep } from '../../../App';
 import { FormStep } from '../../../@Types/FormStep';
 declare function ColumnForm({ form, apiKey, reload, domain, postview, internal, formStyle, sendLabel, widthStats, customSteps, customSend, customSubmit, handleLoaded, originalValues, ...others }: FormComponentProps): JSX.Element;
 export default ColumnForm;
-export declare function calcStepDependencyValue(depStep: FormStep, originalValues: Record<string, any>): any;
+export declare function calcStepDependencyValue(depStep: FormStep, originalValues: Record<string, any>, customSteps?: Record<string, CustomStep>): any;

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

@@ -74,7 +74,7 @@ function ColumnForm(_a) {
     var _this = this;
     var form = _a.form, apiKey = _a.apiKey, reload = _a.reload, domain = _a.domain, postview = _a.postview, internal = _a.internal, formStyle = _a.formStyle, sendLabel = _a.sendLabel, widthStats = _a.widthStats, customSteps = _a.customSteps, customSend = _a.customSend, customSubmit = _a.customSubmit, handleLoaded = _a.handleLoaded, originalValues = _a.originalValues, others = __rest(_a, ["form", "apiKey", "reload", "domain", "postview", "internal", "formStyle", "sendLabel", "widthStats", "customSteps", "customSend", "customSubmit", "handleLoaded", "originalValues"]);
     var _b = useState(false), tempError = _b[0], setTempError = _b[1];
-    var _c = useState(calcDependencies(form.steps, originalValues)), dependencyStore = _c[0], setDependencyStore = _c[1];
+    var _c = useState(calcDependencies(form.steps, originalValues, customSteps)), dependencyStore = _c[0], setDependencyStore = _c[1];
     var _d = useForm({
         defaultValues: originalValues,
         mode: 'onTouched',
@@ -272,6 +272,7 @@ var calcValue = function (idStep, steps, values, customSteps, deleteIds, value)
                     var element = elements_1[_i];
                     var newValue = {
                         id: element.id,
+                        value: element.value,
                     };
                     for (var _c = 0, _d = Object.keys(step.steps); _c < _d.length; _c++) {
                         var idStep_1 = _d[_c];
@@ -311,8 +312,9 @@ function stringToDraft(text) {
     });
     return draftStructure;
 }
-function calcDependencies(steps, originalValues, allSteps, dependencies) {
+function calcDependencies(steps, originalValues, customSteps, allSteps, dependencies) {
     var _a, _b;
+    if (customSteps === void 0) { customSteps = {}; }
     if (allSteps === void 0) { allSteps = steps; }
     if (dependencies === void 0) { dependencies = {}; }
     for (var _i = 0, _c = Object.values(steps); _i < _c.length; _i++) {
@@ -322,7 +324,7 @@ function calcDependencies(steps, originalValues, allSteps, dependencies) {
                 var idDep = _e[_d];
                 var depStep = allSteps[idDep];
                 if (depStep && dependencies[idDep] === undefined) {
-                    dependencies[idDep] = calcStepDependencyValue(depStep, originalValues);
+                    dependencies[idDep] = calcStepDependencyValue(depStep, customSteps, originalValues);
                 }
                 else if (dependencies[idDep] === undefined) {
                     dependencies[idDep] = originalValues[idDep];
@@ -347,13 +349,18 @@ function calcDependencies(steps, originalValues, allSteps, dependencies) {
             if (elements.length === 0) {
                 newSteps = step.steps;
             }
-            calcDependencies(newSteps, originalValues, __assign(__assign({}, allSteps), newSteps), dependencies);
+            calcDependencies(newSteps, originalValues, customSteps, __assign(__assign({}, allSteps), newSteps), dependencies);
         }
     }
     return dependencies;
 }
-export function calcStepDependencyValue(depStep, originalValues) {
-    var _a, _b;
+export function calcStepDependencyValue(depStep, originalValues, customSteps) {
+    var _a, _b, _c, _d;
+    if (customSteps === void 0) { customSteps = {}; }
+    var custom = customSteps[depStep === null || depStep === void 0 ? void 0 : depStep.type];
+    if (custom.calcDependencyValue) {
+        return custom.calcDependencyValue(depStep, originalValues[depStep.id]);
+    }
     switch (depStep.type) {
         case Types.TEXTAREA: {
             if (depStep.hasTextEditor) {
@@ -363,7 +370,10 @@ export function calcStepDependencyValue(depStep, originalValues) {
                 return (_a = originalValues[depStep.id]) === null || _a === void 0 ? void 0 : _a.value;
             }
         }
+        case Types.MAPPER: {
+            return ((_c = (_b = originalValues[depStep.id]) === null || _b === void 0 ? void 0 : _b.map(function (mapperValue) { var _a; return (_a = mapperValue.value) !== null && _a !== void 0 ? _a : mapperValue; })) !== null && _c !== void 0 ? _c : null);
+        }
         default:
-            return (_b = originalValues[depStep.id]) !== null && _b !== void 0 ? _b : null;
+            return (_d = originalValues[depStep.id]) !== null && _d !== void 0 ? _d : null;
     }
 }

package/dist/FormComponents/Step/MapperStep/MaterialMapperStep/MaterialMapperStep.d.ts

@@ -4,6 +4,13 @@ export interface MapperElement {
     ids: Record<string, string>;
     id: string;
     deleted?: boolean;
+    value?: any;
 }
+export declare function ElementsComponent({ step, form, inputRef, editable, postview, elements, formStyle, customAdd, dependencyStore, setDependencyStore, ...others }: MapperStepProps & {
+    onChange: (elements: MapperElement[]) => void;
+    elements: MapperElement[];
+    inputRef: any;
+    customAdd?: JSX.Element;
+}): JSX.Element;
 declare function MapperStep(props: MapperStepProps): JSX.Element;
 export default MapperStep;

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

@@ -30,7 +30,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState, useEffect } from 'react';
+import { useState, useEffect, cloneElement } from 'react';
 import styles from './MaterialMapperStep.module.css';
 import { Controller } from 'react-hook-form';
 import StepTypes, { ClassifierOptionTypes, MapperStyleTypes, OptionTypes, } from '../../../../constants/FormStepTypes';
@@ -40,14 +40,20 @@ import { calcStepDependencyValue } from '../../../Form/ColumnForm/ColumnForm';
 import MapperElementComponent from './Element/MapperElement';
 import AYFFormStepTypes from '../../../../constants/AYFFormStepTypes';
 import CBRFormStepTypes from '../../../../constants/CBRFormStepTypes';
-function Elements(_a) {
-    var step = _a.step, form = _a.form, btnRef = _a.btnRef, editable = _a.editable, postview = _a.postview, onChange = _a.onChange, elements = _a.elements, formStyle = _a.formStyle, dependencyStore = _a.dependencyStore, setDependencyStore = _a.setDependencyStore, others = __rest(_a, ["step", "form", "btnRef", "editable", "postview", "onChange", "elements", "formStyle", "dependencyStore", "setDependencyStore"]);
-    var _b = useState(false), firstRender = _b[0], setFirstRender = _b[1];
+export function ElementsComponent(_a) {
+    var _b, _c;
+    var step = _a.step, form = _a.form, inputRef = _a.inputRef, editable = _a.editable, postview = _a.postview, elements = _a.elements, formStyle = _a.formStyle, customAdd = _a.customAdd, dependencyStore = _a.dependencyStore, setDependencyStore = _a.setDependencyStore, others = __rest(_a, ["step", "form", "inputRef", "editable", "postview", "elements", "formStyle", "customAdd", "dependencyStore", "setDependencyStore"]);
+    var _d = useState(true), firstRender = _d[0], setFirstRender = _d[1];
     /** Mapper Steps to pass down */
-    var _c = useState(), localSteps = _c[0], setLocalSteps = _c[1];
-    useEffect(function () {
-        setFirstRender(true);
-    }, []);
+    var _e = useState(), localSteps = _e[0], setLocalSteps = _e[1];
+    var onChange = function (elements) {
+        var _a;
+        var _b;
+        if (dependencyStore[step.id] !== undefined && customAdd) {
+            setDependencyStore(__assign(__assign({}, dependencyStore), (_a = {}, _a[step.id] = (_b = elements.map(function (element) { return element.value; })) !== null && _b !== void 0 ? _b : null, _a)));
+        }
+        others.onChange(elements);
+    };
     useEffect(function () {
         var _a;
         if (firstRender) {
@@ -73,13 +79,18 @@ function Elements(_a) {
             else if (elements.length === 0 && !postview && editable) {
                 handleAddElement();
             }
+            setFirstRender(false);
+        }
+        else {
+            onChange([]);
         }
-    }, [firstRender]);
-    var handleAddElement = function () {
+    }, __spreadArray([], ((_c = (_b = step.dependencies) === null || _b === void 0 ? void 0 : _b.map(function (dep) { return dependencyStore[dep]; })) !== null && _c !== void 0 ? _c : []), true));
+    var handleAddElement = function (value) {
         var idElement = nanoid();
         var newElement = {
             ids: {},
             id: idElement,
+            value: value,
         };
         var newSteps = {};
         for (var _i = 0, _a = Object.keys(step.steps); _i < _a.length; _i++) {
@@ -116,11 +127,17 @@ function Elements(_a) {
                     var tempElements = __spreadArray([], elements, true);
                     tempElements[index].deleted = true;
                     onChange(tempElements);
-                } }, others), element.id)); }), _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 () {
+                } }, others), element.id)); }), _jsxs("div", __assign({ className: styles.btnContainer }, { children: [_jsx("input", { ref: inputRef, className: styles.hiddenInput }), step.creatable !== false && !customAdd && (_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();
                             }
-                        } }))] }))] })));
+                        } })), step.creatable !== false &&
+                        customAdd &&
+                        cloneElement(customAdd, {
+                            inputRef: inputRef,
+                            disabled: !editable || postview,
+                            handleAddElement: handleAddElement,
+                        })] }))] })));
 }
 function MapperStep(props) {
     return (_jsx(Controller, { name: props.step.id, control: props.control, defaultValue: [], rules: {
@@ -129,7 +146,7 @@ function MapperStep(props) {
                 : undefined,
         }, shouldUnregister: true, render: function (_a) {
             var _b = _a.field, ref = _b.ref, value = _b.value, field = __rest(_b, ["ref", "value"]);
-            return (_jsx(Elements, __assign({}, props, field, { elements: value, btnRef: ref })));
+            return (_jsx(ElementsComponent, __assign({}, props, field, { elements: value, inputRef: ref })));
         } }));
 }
 export default MapperStep;

package/dist/FormComponents/Step/Step.js

@@ -46,14 +46,14 @@ function StepComponent(_a) {
     }
     var customStep = props.customSteps[step.type];
     var editable = props.globalEditable ? (_b = step.editable) !== null && _b !== void 0 ? _b : true : false;
-    if (customStep) {
-        return customStep.component(__assign(__assign(__assign({}, props), ((_c = customStep.componentProps) !== null && _c !== void 0 ? _c : {})), { step: step, editable: editable }));
-    }
     if ((props.postview || !editable) &&
         (props.partial || step.partial) &&
         props.originalValues[step.id] === undefined) {
         return _jsx("div", {});
     }
+    if (customStep) {
+        return customStep.component(__assign(__assign(__assign({}, props), ((_c = customStep.componentProps) !== null && _c !== void 0 ? _c : {})), { step: step, editable: editable }));
+    }
     switch (step.type) {
         case Types.TITLE: {
             return (_jsx(TitleStep, __assign({}, props, { step: step, editable: editable })));

package/package.json

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