@arquimedes.co/eureka-forms 2.0.11-test → 2.0.12-test

package/dist/FormSteps/@Construction/CBRIncidentsStep/MaterialCBRIncidentsStep/MaterialCBRIncidentsStep.js

@@ -77,6 +77,7 @@ function Incidents(_a) {
         dispatch(addStepsDependencies({
             steps: newSteps,
             customSteps: customSteps,
+            allSteps: newSteps,
         }));
     };
     var addRecursiveElementStep = function (idStep, step, idParent, steps, idProjectDep) {

package/dist/FormSteps/MapperStep/MaterialMapperStep/MaterialMapperStep.d.ts

@@ -1,11 +1,6 @@
 /// <reference types="react" />
 import { MapperStepProps } from '../MapperStep';
-import { MapperElement } from '../../../@Types/MapperElement';
-export declare function ElementsComponent<Type = any>({ step, inputRef, editable, elements, customAdd, loading, onChange, ...others }: MapperStepProps<Type> & {
+declare function MapperStep<Type>({ step, level, editable, customAdd, loading, }: MapperStepProps<Type> & {
     loading?: boolean;
-    onChange: (elements: MapperElement<Type>[]) => void;
-    elements: MapperElement<Type>[];
-    inputRef: any;
 }): JSX.Element;
-declare function MapperStep<Type>(props: MapperStepProps<Type>): JSX.Element;
 export default MapperStep;

package/dist/FormSteps/MapperStep/MaterialMapperStep/MaterialMapperStep.js

@@ -30,10 +30,9 @@ 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 { createElement as _createElement } from "react";
 import React, { useState, useEffect, useContext, useMemo, useCallback, } from 'react';
 import styles from './MaterialMapperStep.module.css';
-import { Controller, useFormContext } from 'react-hook-form';
+import { useController, useFormContext } from 'react-hook-form';
 import { MapperStyleTypes } from '../../../constants/FormStepTypes';
 import RoundedButton from '../../../Shared/RoundedButton/RoundedButton';
 import MapperElementComponent from './Element/MapperElementComponent';
@@ -44,46 +43,62 @@ import CustomContext from '../../../Contexts/CustomContext';
 import { useStepDependency } from '../../StepHooks';
 import { addMapperStep } from '../../../App/AppFunctions';
 import { calcMapperSubSteps } from '../../../Form/FormFunctions';
-export function ElementsComponent(_a) {
-    var step = _a.step, inputRef = _a.inputRef, editable = _a.editable, elements = _a.elements, customAdd = _a.customAdd, _b = _a.loading, loading = _b === void 0 ? false : _b, onChange = _a.onChange, others = __rest(_a, ["step", "inputRef", "editable", "elements", "customAdd", "loading", "onChange"]);
+function MapperStep(_a) {
+    var step = _a.step, level = _a.level, editable = _a.editable, customAdd = _a.customAdd, _b = _a.loading, loading = _b === void 0 ? false : _b;
     var form = useContext(FormContext);
     var _c = useAppSelector(function (state) { return state.global; }), formStyle = _c.formStyle, postview = _c.postview;
     var customSteps = useContext(CustomContext).customSteps;
     var dispatch = useAppDispatch();
-    var _d = useFormContext(), setValue = _d.setValue, errors = _d.formState.errors;
-    var handleStepDep = useStepDependency(step).handleStepDep;
-    /** Mapper Steps to pass down */
-    var _e = useState(calcMapperSubSteps(step, elements, customSteps)), localSteps = _e[0], setLocalSteps = _e[1];
+    var _d = useStepDependency(step), handleStepDep = _d.handleStepDep, originalValue = _d.originalValue;
+    var setValue = useFormContext().setValue;
+    var _e = useController({
+        name: step.id,
+        rules: {
+            validate: function (array) {
+                return (step.required &&
+                    array.filter(function (elem) { return !elem.deleted; })
+                        .length > 0) ||
+                    !step.required;
+            },
+        },
+        shouldUnregister: true,
+        defaultValue: originalValue,
+    }), _f = _e.field, ref = _f.ref, value = _f.value, field = __rest(_f, ["ref", "value"]), error = _e.fieldState.error;
+    var _g = useState(calcMapperSubSteps(step, value, customSteps)), localSteps = _g[0], setLocalSteps = _g[1];
+    var onChange = useCallback(function (elements) {
+        handleStepDep(elements.map(function (element) { return element.value; }));
+        field.onChange(elements);
+    }, [field]);
     useEffect(function () {
-        if (elements.length === 0 && !postview && editable && step.creatable) {
+        if (value.length === 0 && !postview && editable && step.creatable) {
             if (!customAdd)
                 handleAddElement();
         }
     }, []);
-    var handleAddElement = useCallback(function (value) {
+    var handleAddElement = useCallback(function (elementValue) {
         var _a = addMapperStep(step, customSteps), element = _a.element, steps = _a.steps, mappers = _a.mappers;
-        if (value)
-            element.value = value;
+        if (elementValue)
+            element.value = elementValue;
         for (var _i = 0, _b = Object.entries(mappers); _i < _b.length; _i++) {
             var _c = _b[_i], key = _c[0], elems = _c[1];
             setValue(key, elems);
         }
-        var newElements = __spreadArray(__spreadArray([], elements, true), [element], false);
-        if (customAdd)
-            handleStepDep(newElements.map(function (element) { return element.value; }));
+        var newElements = __spreadArray(__spreadArray([], value, true), [element], false);
         onChange(newElements);
         setLocalSteps(__assign(__assign({}, localSteps), steps));
-        dispatch(addStepsDependencies({ steps: steps, customSteps: customSteps }));
-    }, [step, customSteps, elements]);
+        dispatch(addStepsDependencies({
+            steps: steps,
+            customSteps: customSteps,
+            allSteps: __assign(__assign({}, form.steps), steps),
+        }));
+    }, [step, customSteps, value]);
     var handleDeleteElement = useCallback(function (index) { return function () {
-        var tempElements = __spreadArray([], elements, true);
+        var tempElements = __spreadArray([], value, true);
         tempElements[index] = __assign(__assign({}, tempElements[index]), { deleted: true });
-        if (customAdd)
-            handleStepDep(tempElements.map(function (element) { return element.value; }));
         onChange(tempElements);
-    }; }, [elements, onChange]);
+    }; }, [value, onChange]);
     var subForm = useMemo(function () { return (__assign(__assign({}, form), { steps: __assign(__assign({}, form.steps), localSteps) })); }, [localSteps]);
-    var value = useMemo(function () { return JSON.stringify(elements); }, [elements]);
+    var inputValue = useMemo(function () { return JSON.stringify(value); }, [value]);
     var container = useMemo(function () {
         var _a;
         switch ((_a = step.style) === null || _a === void 0 ? void 0 : _a.type) {
@@ -95,7 +110,7 @@ export function ElementsComponent(_a) {
         }
     }, [step]).container;
     var mapElements = function () {
-        return (_jsx(FormContext.Provider, __assign({ value: subForm }, { children: elements.map(function (element, index) { return (_createElement(MapperElementComponent, __assign({}, others, { key: element.id, num: index, loading: loading, element: element, step: step, editable: editable, handleDelete: handleDeleteElement(index) }))); }) })));
+        return (_jsx(FormContext.Provider, __assign({ value: subForm }, { children: value.map(function (element, index) { return (_jsx(MapperElementComponent, { num: index, level: level, loading: loading, element: element, step: step, editable: editable, handleDelete: handleDeleteElement(index) }, element.id)); }) })));
     };
     if (step.style.type === MapperStyleTypes.INLINE)
         return _jsx(React.Fragment, { children: mapElements() });
@@ -103,24 +118,12 @@ export function ElementsComponent(_a) {
                     margin: step.description
                         ? '10px 0px'
                         : '0px 0px 5px 0px',
-                } }, { children: step.description }))), mapElements(), _jsx("input", { id: step.id, ref: inputRef, className: 'hidden-input', readOnly: true, value: value }), step.creatable !== false && (_jsxs("div", __assign({ className: styles.btnContainer }, { children: [!customAdd && (_jsx(RoundedButton, { disabled: !editable || postview, text: step.addBtnLabel + (step.required ? ' *' : ''), color: formStyle.primaryContrastColor, backgroundColor: formStyle.primaryColor, fontSize: '1rem', padding: '5px 15px 5px 15px', onClick: function () {
+                } }, { children: step.description }))), mapElements(), _jsx("input", { id: step.id, ref: ref, className: 'hidden-input', readOnly: true, value: inputValue }), step.creatable !== false && (_jsxs("div", __assign({ className: styles.btnContainer }, { children: [!customAdd && (_jsx(RoundedButton, { disabled: !editable || postview, text: step.addBtnLabel + (step.required ? ' *' : ''), color: formStyle.primaryContrastColor, backgroundColor: formStyle.primaryColor, fontSize: '1rem', padding: '5px 15px 5px 15px', onClick: function () {
                             if (editable && !postview) {
                                 handleAddElement();
                             }
-                        } })), customAdd === null || customAdd === void 0 ? void 0 : customAdd(inputRef, !editable || postview, handleAddElement)] }))), !!errors[step.id] &&
-                elements.filter(function (elem) { return !elem.deleted; }).length === 0 && (_jsx("div", __assign({ className: styles.errorMsg, style: { color: formStyle.errorColor } }, { children: "Este campo es obligatorio" })))] })));
-}
-function MapperStep(props) {
-    var originalValue = useStepDependency(props.step).originalValue;
-    return (_jsx(Controller, { name: props.step.id, defaultValue: originalValue, rules: {
-            validate: function (array) {
-                return (props.step.required &&
-                    array.filter(function (elem) { return !elem.deleted; }).length > 0) ||
-                    !props.step.required;
-            },
-        }, shouldUnregister: true, render: function (_a) {
-            var _b = _a.field, ref = _b.ref, value = _b.value, field = __rest(_b, ["ref", "value"]);
-            return (_jsx(ElementsComponent, __assign({}, props, field, { elements: value, inputRef: ref })));
-        } }));
+                        } })), customAdd === null || customAdd === void 0 ? void 0 : customAdd(ref, !editable || postview, handleAddElement)] }))), !!error &&
+                value.filter(function (elem) { return !elem.deleted; })
+                    .length === 0 && (_jsx("div", __assign({ className: styles.errorMsg, style: { color: formStyle.errorColor } }, { children: "Este campo es obligatorio" })))] })));
 }
 export default MapperStep;

package/dist/States/SiteSlice.d.ts

@@ -32,10 +32,11 @@ export declare const SiteSlice: import("@reduxjs/toolkit").Slice<SiteState, {
         };
         type: string;
     }) => void;
-    addStepsDependencies: (state: import("immer/dist/internal").WritableDraft<SiteState>, { payload: { steps, customSteps }, }: {
+    addStepsDependencies: (state: import("immer/dist/internal").WritableDraft<SiteState>, { payload: { steps, customSteps, allSteps }, }: {
         payload: {
             steps: Record<string, FormStep | CBRFormStep>;
             customSteps: Record<string, CustomStep>;
+            allSteps: Record<string, FormStep | CBRFormStep>;
         };
         type: string;
     }) => void;
@@ -55,6 +56,7 @@ export declare const focusStep: import("@reduxjs/toolkit").ActionCreatorWithOpti
 }, "site/setStepDependency">, addStepsDependencies: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     steps: Record<string, FormStep | CBRFormStep>;
     customSteps: Record<string, CustomStep>;
+    allSteps: Record<string, FormStep | CBRFormStep>;
 }, "site/addStepsDependencies">, setEmptyDependency: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     step: GBaseStep;
     empty: StepDependency['empty'];

package/dist/States/SiteSlice.js

@@ -49,8 +49,8 @@ export var SiteSlice = createSlice({
             }
         },
         addStepsDependencies: function (state, _a) {
-            var _b = _a.payload, steps = _b.steps, customSteps = _b.customSteps;
-            calcDependencies(steps, customSteps, steps, state.dependencies);
+            var _b = _a.payload, steps = _b.steps, customSteps = _b.customSteps, allSteps = _b.allSteps;
+            calcDependencies(steps, customSteps, allSteps, state.dependencies);
         },
         handlePrevious: function (state, _a) {
             var payload = _a.payload;

package/package.json

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