@arquimedes.co/eureka-forms 1.9.98-test → 1.9.100-test

package/dist/App.d.ts

@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 import { Classifier, Form } from './@Types/Form';
-import { FormStep } from './@Types/FormStep';
+import { FormStep, Mapper } from './@Types/FormStep';
 export interface AppProps {
     /** If the app is currently a widget */
     isWidget?: boolean;
@@ -49,4 +49,5 @@ export interface CustomStep {
 }
 declare function App({ apiKey, domain, preview, partial, formData, postview, editable, isWidget, internal, valuesData, customSend, customSteps, classifiers, handleConfirmed, customStepProps, ...others }: AppProps): JSX.Element;
 export default App;
-export declare const mapOriginalValue: (step: FormStep, value: any, form?: Form) => any;
+export declare const addInitialMapper: (newValues: Record<string, any>, step: Mapper) => void;
+export declare const mapOriginalValue: (step: FormStep, value: any, newValues: Record<string, any>, form?: Form) => any;

package/dist/App.js

@@ -337,84 +337,82 @@ var migrateStep = function (steps, pStep) {
     return step;
 };
 var mapOriginalValues = function (originalValues, form) {
-    var _a;
     var newValues = {};
-    for (var _i = 0, _b = Object.keys(originalValues); _i < _b.length; _i++) {
-        var idValue = _b[_i];
+    for (var _i = 0, _a = Object.keys(originalValues); _i < _a.length; _i++) {
+        var idValue = _a[_i];
         var step = form.steps[idValue];
         if (step) {
-            if (step.type === StepTypes.MAPPER) {
-                var elements = originalValues[step.id];
-                var mappedElements = [];
-                for (var _c = 0, elements_1 = elements; _c < elements_1.length; _c++) {
-                    var element = elements_1[_c];
-                    var idElement = (_a = element.id) !== null && _a !== void 0 ? _a : nanoid();
-                    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];
-                        var newIdStep = step.id + '-' + idStep + '-' + idElement;
-                        mappedElement.ids[idStep] = newIdStep;
-                        if (element[idStep] !== undefined) {
-                            var value = mapOriginalValue(step.steps[idStep], element[idStep], form);
-                            if (value !== undefined) {
-                                newValues[newIdStep] = value;
-                            }
-                        }
-                    }
-                    mappedElements.push(mappedElement);
-                }
-                newValues[step.id] = mappedElements;
-            }
-            else {
-                var value = mapOriginalValue(step, originalValues[step.id], form);
-                if (value !== undefined) {
-                    newValues[step.id] = value;
-                }
+            var value = mapOriginalValue(step, originalValues[step.id], newValues, form);
+            if (value !== undefined) {
+                newValues[step.id] = value;
             }
         }
         else {
             newValues[idValue] = originalValues[idValue];
         }
     }
-    addInitialMappers(newValues, form.steps);
-    console.log(newValues);
-    return newValues;
-};
-var addInitialMappers = function (newValues, steps) {
-    for (var _i = 0, _a = Object.values(steps); _i < _a.length; _i++) {
-        var step = _a[_i];
+    for (var _b = 0, _c = Object.values(form.steps); _b < _c.length; _b++) {
+        var step = _c[_b];
         if (step.type !== StepTypes.MAPPER || newValues[step.id])
             continue;
-        var idElement = nanoid();
-        var newElement = {
-            ids: {},
-            id: idElement,
-        };
-        var newSteps = {};
-        for (var _b = 0, _c = Object.keys(step.steps); _b < _c.length; _b++) {
-            var idStep = _c[_b];
-            var baseStep = JSON.parse(JSON.stringify(step.steps[idStep]));
-            var newIdStep = step.id + '-' + idStep + '-' + idElement;
-            baseStep.id = newIdStep;
-            newElement.ids[idStep] = newIdStep;
-            newSteps[newIdStep] = baseStep;
+        addInitialMapper(newValues, step);
+    }
+    return newValues;
+};
+export var addInitialMapper = function (newValues, step) {
+    var idElement = nanoid();
+    var newElement = {
+        ids: {},
+        id: idElement,
+    };
+    var newSteps = {};
+    for (var _i = 0, _a = Object.keys(step.steps); _i < _a.length; _i++) {
+        var idStep = _a[_i];
+        var baseStep = JSON.parse(JSON.stringify(step.steps[idStep]));
+        var newIdStep = step.id + '-' + idStep + '-' + idElement;
+        baseStep.id = newIdStep;
+        newElement.ids[idStep] = newIdStep;
+        newSteps[newIdStep] = baseStep;
+        if (baseStep.type === StepTypes.MAPPER) {
+            addInitialMapper(newValues, baseStep);
         }
-        addInitialMappers(newValues, step.steps);
-        newValues[step.id] = [newElement];
     }
+    newValues[step.id] = [newElement];
 };
-export var mapOriginalValue = function (step, value, form) {
-    var _a, _b, _c, _d;
+export var mapOriginalValue = function (step, value, newValues, form) {
+    var _a, _b, _c, _d, _e;
     switch (step === null || step === void 0 ? void 0 : step.type) {
+        case StepTypes.MAPPER: {
+            var elements = value;
+            var mappedElements = [];
+            for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
+                var element = elements_1[_i];
+                var idElement = (_a = element.id) !== null && _a !== void 0 ? _a : nanoid();
+                var mappedElement = {
+                    id: idElement,
+                    ids: {},
+                    value: element.value,
+                };
+                for (var _f = 0, _g = Object.keys(step.steps); _f < _g.length; _f++) {
+                    var idStep = _g[_f];
+                    var newIdStep = step.id + '-' + idStep + '-' + idElement;
+                    mappedElement.ids[idStep] = newIdStep;
+                    if (element[idStep] !== undefined) {
+                        var value_1 = mapOriginalValue(step.steps[idStep], element[idStep], newValues, form);
+                        if (value_1 !== undefined) {
+                            newValues[newIdStep] = value_1;
+                        }
+                    }
+                }
+                mappedElements.push(mappedElement);
+            }
+            return mappedElements;
+        }
         case StepTypes.TEXTAREA: {
             if (step.hasTextEditor) {
                 return calcDefaultDraftValue(value);
             }
-            return (_a = value.value) !== null && _a !== void 0 ? _a : value;
+            return (_b = value.value) !== null && _b !== void 0 ? _b : value;
         }
         case StepTypes.SELECTOR: {
             var option = step.options.find(function (option) { return option.value == value; });
@@ -423,9 +421,9 @@ export var mapOriginalValue = function (step, value, form) {
             return value;
         }
         case StepTypes.CLASSIFIER_SELECTOR: {
-            var stepClassifier = (_b = form === null || form === void 0 ? void 0 : form.classifiers) === null || _b === void 0 ? void 0 : _b[(_c = step.idClassifier) !== null && _c !== void 0 ? _c : ''];
+            var stepClassifier = (_c = form === null || form === void 0 ? void 0 : form.classifiers) === null || _c === void 0 ? void 0 : _c[(_d = step.idClassifier) !== null && _d !== void 0 ? _d : ''];
             if (stepClassifier) {
-                var classifier = (_d = form.classifiers) === null || _d === void 0 ? void 0 : _d[value];
+                var classifier = (_e = form.classifiers) === null || _e === void 0 ? void 0 : _e[value];
                 if (!(value === null || value === void 0 ? void 0 : value.value))
                     return { value: value, label: classifier === null || classifier === void 0 ? void 0 : classifier.name };
             }

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

@@ -165,7 +165,7 @@ function ColumnForm(_a) {
     return (_jsxs("div", __assign({ className: styles.container, style: { color: formStyle.textColor } }, { children: [loading && _jsx("div", { className: styles.curtain }), showConfirmation !== undefined && (_jsx(ConfirmationDialog, { formStyle: formStyle, confirmation: showConfirmation, onClose: function () {
                     reload();
                     setShowConfirmation(undefined);
-                } })), sections.map(function (idSection, index) { return (_jsx(SectionComponent, __assign({ form: form, sendLabel: sendLabel, domain: domain, postview: postview, clearErrors: clearErrors, widthStats: widthStats, control: control, getValues: getValues, originalValues: originalValues, errors: errors, index: index, setSections: setSections, section: form.sections[idSection], formStyle: formStyle, customSteps: customSteps, setDependencyStore: setDependencyStore, dependencyStore: dependencyStore, setFocus: setFocus }, others), idSection)); }), form.terms &&
+                } })), sections.map(function (idSection, index) { return (_jsx(SectionComponent, __assign({ form: form, sendLabel: sendLabel, domain: domain, postview: postview, clearErrors: clearErrors, widthStats: widthStats, control: control, getValues: getValues, originalValues: originalValues, errors: errors, index: index, setSections: setSections, section: form.sections[idSection], formStyle: formStyle, customSteps: customSteps, setDependencyStore: setDependencyStore, dependencyStore: dependencyStore, setFocus: setFocus, setValue: setValue }, others), idSection)); }), form.terms &&
                 (!internal || (internal && postview)) &&
                 (originalValues === null || originalValues === void 0 ? void 0 : originalValues['INTERNAL_CREATING_AGENT']) === undefined && (_jsx("div", __assign({ className: styles.termsContainer, style: {
                     width: (form.size.blockSize + form.size.spacingSize) *

package/dist/FormComponents/Section/Section.d.ts

@@ -27,6 +27,7 @@ export interface RecursiveData {
     dependencyStore: Record<string, any>;
     setDependencyStore: React.Dispatch<React.SetStateAction<Record<string, any>>>;
     setFocus: (id: string) => void;
+    setValue: (id: string, value: any) => void;
 }
 export interface SectionComponentProps extends RecursiveData {
     /** The custom send label to display */

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

@@ -17,14 +17,15 @@ function PillMapperElement(_a) {
     var step = _a.step, form = _a.form, num = _a.num, loading = _a.loading, element = _a.element, children = _a.children, editable = _a.editable, postview = _a.postview, formStyle = _a.formStyle, handleDelete = _a.handleDelete, widthStats = _a.widthStats, customElementModifiers = _a.customElementModifiers;
     var size = form.size;
     var calcName = (customElementModifiers !== null && customElementModifiers !== void 0 ? customElementModifiers : {}).calcName;
+    var name = calcName
+        ? calcName(element)
+        : step.unitLabel
+            ? step.unitLabel + ' ' + (num + 1).toString()
+            : '';
     return (_jsx("div", __assign({ className: widthStats.isMobile ? styles.mobileContainer : styles.container }, { children: _jsxs("div", __assign({ className: styles.contentContainer, style: {
                 width: (size.blockSize + size.spacingSize) *
                     ((_c = (_b = step.style) === null || _b === void 0 ? void 0 : _b.size) !== null && _c !== void 0 ? _c : size.blockNum - 1),
-            } }, { children: [_jsx("div", __assign({ className: styles.titleLbl, style: { color: formStyle.textColor } }, { children: loading
-                        ? ''
-                        : (calcName
-                            ? calcName(element)
-                            : step.unitLabel + ' ' + (num + 1)) + ':' })), step.deletable !== false && (_jsx("div", __assign({ className: !editable || postview
+            } }, { children: [_jsx("div", __assign({ className: styles.titleLbl, style: { color: formStyle.textColor } }, { children: loading ? '' : name })), step.deletable !== false && (_jsx("div", __assign({ className: !editable || postview
                         ? styles.disabledDeleteBtn
                         : styles.deleteBtn, style: { color: formStyle.textColor }, onClick: function () {
                         if (editable && !postview) {

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

@@ -30,6 +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 { createElement as _createElement } from "react";
 import React, { useState, useEffect, cloneElement } from 'react';
 import styles from './MaterialMapperStep.module.css';
 import { Controller } from 'react-hook-form';
@@ -40,46 +41,44 @@ import { calcStepDependencyValue } from '../../../Form/ColumnForm/ColumnForm';
 import MapperElementComponent from './Element/MapperElement';
 import AYFFormStepTypes from '../../../../constants/AYFFormStepTypes';
 import CBRFormStepTypes from '../../../../constants/CBRFormStepTypes';
+import { addInitialMapper } from '../../../../App';
 export function ElementsComponent(_a) {
     var _b, _c;
     var step = _a.step, form = _a.form, errors = _a.errors, inputRef = _a.inputRef, editable = _a.editable, postview = _a.postview, elements = _a.elements, formStyle = _a.formStyle, customAdd = _a.customAdd, _d = _a.loading, loading = _d === void 0 ? false : _d, dependencyStore = _a.dependencyStore, setDependencyStore = _a.setDependencyStore, others = __rest(_a, ["step", "form", "errors", "inputRef", "editable", "postview", "elements", "formStyle", "customAdd", "loading", "dependencyStore", "setDependencyStore"]);
     var _e = useState(true), firstRender = _e[0], setFirstRender = _e[1];
     /** Mapper Steps to pass down */
-    var _f = useState(), localSteps = _f[0], setLocalSteps = _f[1];
-    var onChange = function (elements) {
+    var _f = useState((function () {
         var _a;
-        var _b;
+        var newSteps = {};
+        for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
+            var element = elements_1[_i];
+            var elemSteps = {};
+            for (var _b = 0, _c = Object.keys(step.steps); _b < _c.length; _b++) {
+                var idStep = _c[_b];
+                var baseStep = JSON.parse(JSON.stringify((_a = step.steps[idStep]) !== null && _a !== void 0 ? _a : '{}'));
+                var newIdStep = element.ids[idStep];
+                baseStep.id = newIdStep;
+                elemSteps[newIdStep] = baseStep;
+                newSteps[newIdStep] = baseStep;
+            }
+            calcRecursiveData(element, elemSteps, {}, others.customSteps, others.originalValues);
+        }
+        return newSteps;
+    })()), localSteps = _f[0], setLocalSteps = _f[1];
+    var onChange = function (elements) {
         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)));
+            setDependencyStore(function (dependencyStore) {
+                var _a;
+                var _b;
+                return (__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) {
-            if (elements.length > 0) {
-                var newSteps = {};
-                var deps = __assign({}, dependencyStore);
-                for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
-                    var element = elements_1[_i];
-                    var elemSteps = {};
-                    for (var _b = 0, _c = Object.keys(step.steps); _b < _c.length; _b++) {
-                        var idStep = _c[_b];
-                        var baseStep = JSON.parse(JSON.stringify((_a = step.steps[idStep]) !== null && _a !== void 0 ? _a : '{}'));
-                        var newIdStep = element.ids[idStep];
-                        baseStep.id = newIdStep;
-                        elemSteps[newIdStep] = baseStep;
-                        newSteps[newIdStep] = baseStep;
-                    }
-                    calcRecursiveData(element, elemSteps, deps, others.customSteps, others.originalValues);
-                }
-                setDependencyStore(deps);
-                setLocalSteps(__assign(__assign({}, localSteps), newSteps));
-            }
-            else if (elements.length === 0 && !postview && editable) {
-                if (customAdd)
-                    setLocalSteps({});
-                else
+            if (elements.length === 0 && !postview && editable) {
+                if (!customAdd)
                     handleAddElement();
             }
             setFirstRender(false);
@@ -96,6 +95,7 @@ export function ElementsComponent(_a) {
             value: value,
         };
         var newSteps = {};
+        var newValues = {};
         for (var _i = 0, _a = Object.keys(step.steps); _i < _a.length; _i++) {
             var idStep = _a[_i];
             var baseStep = JSON.parse(JSON.stringify(step.steps[idStep]));
@@ -103,6 +103,13 @@ export function ElementsComponent(_a) {
             baseStep.id = newIdStep;
             newElement.ids[idStep] = newIdStep;
             newSteps[newIdStep] = baseStep;
+            if (baseStep.type === StepTypes.MAPPER) {
+                addInitialMapper(newValues, baseStep);
+            }
+        }
+        for (var _b = 0, _c = Object.entries(newValues); _b < _c.length; _b++) {
+            var _d = _c[_b], key = _d[0], elems = _d[1];
+            others.setValue(key, elems);
         }
         var deps = __assign({}, dependencyStore);
         calcRecursiveData(newElement, newSteps, others.customSteps, deps);
@@ -121,14 +128,12 @@ export function ElementsComponent(_a) {
         }
     };
     var container = calcStyles().container;
-    if (!localSteps)
-        return _jsx("div", {});
     var mapElements = function () {
-        return elements.map(function (element, index) { return (_jsx(MapperElementComponent, __assign({ num: index, loading: loading, element: element, formStyle: formStyle, step: step, errors: errors, form: __assign(__assign({}, form), { steps: __assign(__assign({}, form.steps), localSteps) }), editable: editable, postview: postview, dependencyStore: dependencyStore, setDependencyStore: setDependencyStore, handleDelete: function () {
+        return elements.map(function (element, index) { return (_createElement(MapperElementComponent, __assign({}, others, { key: element.id, num: index, loading: loading, element: element, formStyle: formStyle, step: step, errors: errors, form: __assign(__assign({}, form), { steps: __assign(__assign({}, form.steps), localSteps) }), editable: editable, postview: postview, dependencyStore: dependencyStore, setDependencyStore: setDependencyStore, handleDelete: function () {
                 var tempElements = __spreadArray([], elements, true);
                 tempElements[index].deleted = true;
                 onChange(tempElements);
-            } }, others), element.id)); });
+            } }))); });
     };
     if (step.style.type === MapperStyleTypes.INLINE)
         return _jsx(React.Fragment, { children: mapElements() });

package/dist/FormComponents/Step/TitleStep/MaterialTitleStep/MaterialTitleStep.js

@@ -9,6 +9,17 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Controller } from 'react-hook-form';
 import { calcStepWidth } from '../../StepFunctions';
@@ -37,8 +48,8 @@ function TitleStep(props) {
             title: props.step.title,
             description: props.step.description,
         }, render: function (_a) {
-            var field = _a.field;
-            return _jsx(Title, __assign({}, props, field));
+            var _b = _a.field, ref = _b.ref, field = __rest(_b, ["ref"]);
+            return (_jsx(Title, __assign({}, props, field, { inputRef: ref })));
         } }));
 }
 export default TitleStep;

package/package.json

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