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

package/dist/App/AppFunctions.d.ts

@@ -1,10 +1,9 @@
 import { Form } from '../@Types';
 import { FormStep, Mapper } from '../@Types/FormStep';
 import { SiteState, ValuesStore } from '../States/SiteSlice';
-import { DependencyStore } from '../Form/Form';
 import { CustomStep } from '../FormSteps/CustomStep';
 import { MapperElement } from '../@Types/MapperElement';
-export declare const calcValuesStore: (originalValues: Record<string, any>, form: Form, dependencies: DependencyStore, customSteps: Record<string, CustomStep>) => ValuesStore;
+export declare const calcValuesStore: (form: Form, originalValues?: Record<string, any>, postview?: boolean, customSteps?: Record<string, CustomStep>) => ValuesStore;
 export declare const addMapperStep: <Type>(step: Mapper, customSteps: Record<string, CustomStep>) => {
     element: MapperElement<Type>;
     /** Record of all the new mapper values created */

package/dist/App/AppFunctions.js

@@ -11,13 +11,14 @@ var __assign = (this && this.__assign) || function () {
 };
 import { nanoid } from 'nanoid';
 import StepTypes, { FormTypes } from '../constants/FormStepTypes';
-import { EditorState, convertFromRaw } from 'draft-js';
 import { getRawText, stringToDraft } from '../Utils/DraftFunctions';
-import { calcDependencies } from '../Form/FormFunctions';
 import { calcSubSteps } from '../FormSteps/StepFunctions';
-export var calcValuesStore = function (originalValues, form, dependencies, customSteps) {
+export var calcValuesStore = function (form, originalValues, postview, customSteps) {
     var _a;
     var _b;
+    if (originalValues === void 0) { originalValues = {}; }
+    if (postview === void 0) { postview = false; }
+    if (customSteps === void 0) { customSteps = {}; }
     var values = {
         global: {},
         sections: {},
@@ -37,17 +38,21 @@ export var calcValuesStore = function (originalValues, form, dependencies, custo
             values.global[idValue] = originalValues[idValue];
         }
     }
-    for (var _d = 0, _e = Object.values(form.steps); _d < _e.length; _d++) {
-        var step = _e[_d];
-        if (step.type !== StepTypes.MAPPER ||
-            ((_b = values.sections[step.idSection]) === null || _b === void 0 ? void 0 : _b[step.id]) ||
-            !step.required)
-            continue;
-        if (!values.sections[step.idSection])
-            values.sections[step.idSection] = {};
-        var _f = addMapperStep(step, customSteps), element = _f.element, steps = _f.steps, mappers = _f.mappers;
-        values.sections[step.idSection] = __assign(__assign(__assign({}, values.sections[step.idSection]), mappers), (_a = {}, _a[step.id] = [element], _a));
-        calcDependencies(steps, customSteps, __assign(__assign({}, form.steps), steps), dependencies, values);
+    if (postview)
+        return values;
+    for (var _d = 0, _e = Object.values(form.sections); _d < _e.length; _d++) {
+        var section = _e[_d];
+        for (var _f = 0, _g = section.steps; _f < _g.length; _f++) {
+            var idStep = _g[_f];
+            var step = form.steps[idStep];
+            if (step.type !== StepTypes.MAPPER ||
+                ((_b = values.sections[step.idSection]) === null || _b === void 0 ? void 0 : _b[step.id]))
+                continue;
+            if (!values.sections[step.idSection])
+                values.sections[step.idSection] = {};
+            var _h = addMapperStep(step, customSteps), element = _h.element, mappers = _h.mappers;
+            values.sections[step.idSection] = __assign(__assign(__assign({}, values.sections[step.idSection]), mappers), (_a = {}, _a[step.id] = [element], _a));
+        }
     }
     return values;
 };
@@ -70,9 +75,9 @@ export var addMapperStep = function (step, customSteps) {
         steps[newIdStep] = baseStep;
     }
     calcRecursiveData(element, steps, customSteps);
-    for (var _b = 0, _c = Object.values(steps); _b < _c.length; _b++) {
+    for (var _b = 0, _c = Object.values(step.steps); _b < _c.length; _b++) {
         var nestedStep = _c[_b];
-        if (nestedStep.type === StepTypes.MAPPER && nestedStep.required) {
+        if (nestedStep.type === StepTypes.MAPPER) {
             var nested = addMapperStep(nestedStep, customSteps);
             steps = __assign(__assign({}, steps), nested.steps);
             mappers = __assign(__assign({}, mappers), nested.mappers);
@@ -87,6 +92,7 @@ export function calcRecursiveData(element, newSteps, customSteps) {
     for (var _i = 0, _a = Object.keys(newSteps); _i < _a.length; _i++) {
         var idStep = _a[_i];
         var step = newSteps[idStep];
+        step.id = idStep;
         if (step.dependencies) {
             for (var i = 0; i < step.dependencies.length; i++) {
                 var idDep = step.dependencies[i];
@@ -146,7 +152,10 @@ export var mapOriginalValue = function (step, value, values, form) {
         }
         case StepTypes.TEXTAREA: {
             if (step.hasTextEditor) {
-                return calcDefaultDraftValue(value);
+                if (typeof value === 'string') {
+                    return stringToDraft(value);
+                }
+                return getRawText(value === null || value === void 0 ? void 0 : value.draft, value === null || value === void 0 ? void 0 : value.text);
             }
             var defaultValue = (_b = value.value) !== null && _b !== void 0 ? _b : value;
             if (typeof defaultValue === 'string') {
@@ -180,14 +189,6 @@ export var mapOriginalValue = function (step, value, values, form) {
             return value;
     }
 };
-var calcDefaultDraftValue = function (defaultValue) {
-    if (typeof defaultValue === 'string') {
-        return EditorState.createWithContent(convertFromRaw(stringToDraft(defaultValue)));
-    }
-    else {
-        return EditorState.createWithContent(convertFromRaw(getRawText(defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.draft, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.text)));
-    }
-};
 export var calcInitialSections = function (form) {
     var previousSections = [];
     var nextSections = calcNextSections(form.firstSection, form);

package/dist/App/AppHooks.js

@@ -171,7 +171,7 @@ export var useSetupApp = function (isEmbedded, _a) {
                     if (!form || !idOrganization)
                         return [2 /*return*/];
                     dependencies = {};
-                    values = calcValuesStore(valuesData !== null && valuesData !== void 0 ? valuesData : {}, form, dependencies, customSteps !== null && customSteps !== void 0 ? customSteps : {});
+                    values = calcValuesStore(form, valuesData, postview, customSteps);
                     dispatch(reset(__assign(__assign({ formStyle: internal
                             ? InternalFormStyle
                             : __assign(__assign({}, InternalFormStyle), ((_b = form === null || form === void 0 ? void 0 : form.style) !== null && _b !== void 0 ? _b : {})), internal: !!internal, idOrganization: idOrganization, preview: !!preview, partial: !!partial, postview: !!postview, editable: !!(editable !== null && editable !== void 0 ? editable : true), values: values }, calcInitialSections(form)), { dependencies: calcDependencies(form.steps, customSteps, form.steps, dependencies, values) })));

package/dist/Form/FormFunctions.d.ts

@@ -1,7 +1,9 @@
-import { FormStep } from '../@Types/FormStep';
+import { FormStep, Mapper } from '../@Types/FormStep';
 import { DependencyStore } from './Form';
 import { CustomStep } from '../FormSteps/CustomStep';
 import { CBRFormStep } from '../@Types/CBRFormStep';
+import { MapperElement } from '../@Types/MapperElement';
 import { ValuesStore } from '../States/SiteSlice';
 export declare const calcValue: (idStep: string, steps: Record<string, FormStep>, values: Record<string, any>, customSteps: Record<string, CustomStep> | undefined, deleteIds: string[], value?: any) => any;
 export declare function calcDependencies(steps: Record<string, FormStep | CBRFormStep>, customSteps?: Record<string, CustomStep>, allSteps?: Record<string, FormStep | CBRFormStep>, dependencies?: DependencyStore, values?: ValuesStore): DependencyStore;
+export declare const calcMapperSubSteps: (step: Mapper, elements: MapperElement<any>[] | undefined, customSteps: Record<string, CustomStep>) => Record<string, FormStep>;

package/dist/Form/FormFunctions.js

@@ -20,6 +20,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 import { convertToRaw } from 'draft-js';
 import StepTypes, { EntityValueDataTypes } from '../constants/FormStepTypes';
+import { calcRecursiveData } from '../App/AppFunctions';
 export var calcValue = function (idStep, steps, values, customSteps, deleteIds, value) {
     var _a, _b;
     if (value === void 0) { value = values[idStep]; }
@@ -113,7 +114,7 @@ function stringToDraft(text) {
     return draftStructure;
 }
 export function calcDependencies(steps, customSteps, allSteps, dependencies, values) {
-    var _a, _b, _c;
+    var _a, _b;
     if (customSteps === void 0) { customSteps = {}; }
     if (allSteps === void 0) { allSteps = steps; }
     if (dependencies === void 0) { dependencies = {}; }
@@ -121,58 +122,63 @@ export function calcDependencies(steps, customSteps, allSteps, dependencies, val
         global: {},
         sections: {},
     }; }
-    for (var _i = 0, _d = Object.values(steps); _i < _d.length; _i++) {
-        var step = _d[_i];
+    for (var _i = 0, _c = Object.values(steps); _i < _c.length; _i++) {
+        var step = _c[_i];
         var originalValue = (_a = values.sections[step.idSection]) === null || _a === void 0 ? void 0 : _a[step.id];
         if (step.dependencies) {
-            for (var _e = 0, _f = step.dependencies; _e < _f.length; _e++) {
-                var idDep = _f[_e];
+            for (var _d = 0, _e = step.dependencies; _d < _e.length; _d++) {
+                var idDep = _e[_d];
                 if (dependencies[idDep] === undefined)
-                    dependencies[idDep] = calcStepDependency(idDep, allSteps, originalValue, customSteps);
+                    dependencies[idDep] = calcStepDependency(idDep, allSteps, values, customSteps);
                 dependencies[idDep].dependents.push(step);
             }
         }
         if (step.type === StepTypes.ENTITYVALUEPICKER) {
-            for (var _g = 0, _h = __spreadArray(__spreadArray([], step.path, true), step.filters, true); _g < _h.length; _g++) {
-                var path = _h[_g];
+            for (var _f = 0, _g = __spreadArray(__spreadArray([], step.path, true), step.filters, true); _f < _g.length; _f++) {
+                var path = _g[_f];
                 if (path.type !== EntityValueDataTypes.STEP)
                     continue;
                 if ((_b = step.dependencies) === null || _b === void 0 ? void 0 : _b.includes(path.idStep))
                     continue;
                 if (dependencies[path.idStep] === undefined) {
-                    dependencies[path.idStep] = calcStepDependency(path.idStep, allSteps, originalValue, customSteps);
+                    dependencies[path.idStep] = calcStepDependency(path.idStep, allSteps, values, customSteps);
                 }
                 dependencies[path.idStep].dependents.push(step);
             }
         }
         if (step.type === StepTypes.MAPPER) {
-            var newSteps = {};
-            var elements = originalValue !== null && originalValue !== void 0 ? originalValue : [];
-            var _loop_1 = function (element) {
-                for (var _k = 0, _l = Object.keys(step.steps); _k < _l.length; _k++) {
-                    var idSubStep = _l[_k];
-                    var subStep = step.steps[idSubStep];
-                    var mappedId = element.ids[idSubStep];
-                    newSteps[mappedId] = __assign(__assign({}, subStep), { id: mappedId, dependencies: (_c = subStep.dependencies) === null || _c === void 0 ? void 0 : _c.map(function (dep) { var _a; return (_a = element.ids[dep]) !== null && _a !== void 0 ? _a : dep; }) });
-                }
-            };
-            for (var _j = 0, elements_2 = elements; _j < elements_2.length; _j++) {
-                var element = elements_2[_j];
-                _loop_1(element);
-            }
-            if (elements.length === 0) {
-                newSteps = step.steps;
-            }
-            calcDependencies(newSteps, customSteps, __assign(__assign({}, allSteps), newSteps), dependencies, values);
+            var subSteps = calcMapperSubSteps(step, originalValue, customSteps);
+            if (Object.keys(subSteps).length > 0)
+                calcDependencies(subSteps, customSteps, __assign(__assign({}, allSteps), subSteps), dependencies, values);
         }
     }
     return dependencies;
 }
-function calcStepDependency(idStep, steps, originalValue, customSteps) {
+export var calcMapperSubSteps = function (step, elements, customSteps) {
     var _a;
+    if (elements === void 0) { elements = []; }
+    var newSteps = {};
+    for (var _i = 0, elements_2 = elements; _i < elements_2.length; _i++) {
+        var element = elements_2[_i];
+        var elemSteps = {};
+        for (var _b = 0, _c = Object.keys(step.steps); _b < _c.length; _b++) {
+            var idSubStep = _c[_b];
+            var baseStep = JSON.parse(JSON.stringify((_a = step.steps[idSubStep]) !== null && _a !== void 0 ? _a : '{}'));
+            var newIdStep = element.ids[idSubStep];
+            baseStep.id = newIdStep;
+            elemSteps[newIdStep] = baseStep;
+            newSteps[newIdStep] = baseStep;
+        }
+        calcRecursiveData(element, elemSteps, customSteps);
+    }
+    return newSteps;
+};
+function calcStepDependency(idStep, steps, values, customSteps) {
+    var _a, _b;
     var depStep = steps[idStep];
+    var originalValue = (_a = values.sections[depStep.idSection]) === null || _a === void 0 ? void 0 : _a[depStep.id];
     return {
-        type: (_a = depStep === null || depStep === void 0 ? void 0 : depStep.type) !== null && _a !== void 0 ? _a : 'ORIGINAL',
+        type: (_b = depStep === null || depStep === void 0 ? void 0 : depStep.type) !== null && _b !== void 0 ? _b : 'ORIGINAL',
         value: depStep
             ? calcStepDependencyValue(depStep, originalValue, customSteps)
             : originalValue !== null && originalValue !== void 0 ? originalValue : null,

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

@@ -42,7 +42,8 @@ import FormContext from '../../../Contexts/FormContext';
 import { useAppDispatch, useAppSelector } from '../../../hooks';
 import CustomContext from '../../../Contexts/CustomContext';
 import { useStepDependency } from '../../StepHooks';
-import { addMapperStep, calcRecursiveData } from '../../../App/AppFunctions';
+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"]);
     var form = useContext(FormContext);
@@ -52,24 +53,7 @@ export function ElementsComponent(_a) {
     var _d = useFormContext(), setValue = _d.setValue, errors = _d.formState.errors;
     var handleStepDep = useStepDependency(step).handleStepDep;
     /** Mapper Steps to pass down */
-    var _e = useState((function () {
-        var _a;
-        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, customSteps);
-        }
-        return newSteps;
-    })()), localSteps = _e[0], setLocalSteps = _e[1];
+    var _e = useState(calcMapperSubSteps(step, elements, customSteps)), localSteps = _e[0], setLocalSteps = _e[1];
     useEffect(function () {
         if (elements.length === 0 && !postview && editable && step.creatable) {
             if (!customAdd)

package/dist/FormSteps/SmartSelectStep/MaterialSmartSelectStep/MaterialSmartSelectStep.js

@@ -101,7 +101,8 @@ export function SmartSelect(_a) {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    setOptions(undefined);
+                    if (!firstTime)
+                        setOptions(undefined);
                     if (value && !firstTime)
                         setLoading(true);
                     _a.label = 1;
@@ -116,7 +117,7 @@ export function SmartSelect(_a) {
                             newValue = resp.find(function (option) {
                                 return getValueString(option) === getValueString(value);
                             });
-                            if (!firstTime || newValue)
+                            if (!firstTime)
                                 onChange(newValue);
                         }
                         else if (!firstTime)
@@ -145,9 +146,9 @@ export function SmartSelect(_a) {
     }); };
     var warning = useMemo(function () { return getValueWarning === null || getValueWarning === void 0 ? void 0 : getValueWarning(value); }, [value]);
     var onFocus = useCallback(function () {
-        if (disabled)
+        if (disabled || !editable || postview)
             return;
-        if (options === null && !(!editable || postview)) {
+        if (options === null) {
             if (!value) {
                 if (invalids.length > 0) {
                     var depStep = form.steps[invalids[0]];
@@ -167,7 +168,7 @@ export function SmartSelect(_a) {
                 }
             }
         }
-        if (options === undefined && !(!editable || postview)) {
+        if (options === undefined) {
             setLoading(true);
         }
         if (!touched)
@@ -177,6 +178,8 @@ export function SmartSelect(_a) {
         valueOverwrite ? onChange(valueOverwrite(value)) : onChange(value);
     }, [valueOverwrite, onChange]);
     var errorMsg = useMemo(function () {
+        if (postview || loading)
+            return undefined;
         if (invalids.length > 0 && touched) {
             return calcDepError === null || calcDepError === void 0 ? void 0 : calcDepError(invalids.map(function (idDep) { return form.steps[idDep]; }));
         }

package/dist/FormSteps/StepFunctions.js

@@ -1,7 +1,7 @@
-import { EditorState } from 'draft-js';
 import Types, { ApiSelectorOptionTypes, ClassifierOptionTypes, EntityValueDataTypes, EntityValueOptionTypes, OptionTypes, StepTypes, } from '../constants/FormStepTypes';
 import CBRFormStepTypes from '../constants/CBRFormStepTypes';
 import AYFFormStepTypes from '../constants/AYFFormStepTypes';
+import { getRawText } from '../Utils/DraftFunctions';
 export function calcFillerSize(step, steps, values, size) {
     var _a;
     var maxSize = (_a = step.maxSize) !== null && _a !== void 0 ? _a : size.blockNum;
@@ -110,7 +110,7 @@ export var calcDefaultValue = function (step) {
             return '';
         case StepTypes.TEXTAREA:
             if (step.hasTextEditor)
-                return EditorState.createEmpty();
+                return getRawText();
             else
                 return '';
         case StepTypes.RATING:

package/dist/FormSteps/TextAreaStep/MaterialTextAreaStep/MaterialTextAreaEditorStep.js

@@ -30,6 +30,7 @@ import { useCallback, useState } from 'react';
 import { ClickAwayListener } from '@material-ui/core';
 import { useAppSelector } from '../../../hooks';
 import { useStepDependency } from '../../StepHooks';
+import { EditorState, convertFromRaw } from 'draft-js';
 function TextAreaStep(_a) {
     var _b;
     var step = _a.step, editable = _a.editable;
@@ -48,7 +49,7 @@ function TextAreaStep(_a) {
                 },
             }
             : {},
-        defaultValue: originalValue,
+        defaultValue: EditorState.createWithContent(convertFromRaw(originalValue)),
     }), _j = _h.field, ref = _j.ref, onChange = _j.onChange, field = __rest(_j, ["ref", "onChange"]), error = _h.fieldState.error;
     var handleChange = useCallback(function (value) {
         if (isDependency) {

package/dist/FormSteps/TitleStep/MaterialTitleStep/MaterialTitleStep.js

@@ -52,7 +52,7 @@ function Title(_a) {
 }
 function TitleStep(props) {
     var step = props.step;
-    var originalValue = useStepDependency(step);
+    var originalValue = useStepDependency(step).originalValue;
     return (_jsx(Controller, { name: step.id, defaultValue: originalValue, render: function (_a) {
             var _b = _a.field, ref = _b.ref, field = __rest(_b, ["ref"]);
             return (_jsx(Title, __assign({}, props, field, { inputRef: ref })));

package/dist/Utils/DraftFunctions.js

@@ -1,3 +1,4 @@
+import { nanoid } from '@reduxjs/toolkit';
 export function stringToDraft(text) {
     var draftStructure = {
         blocks: [],
@@ -27,7 +28,7 @@ export var getRawText = function (draft, text) {
         return {
             blocks: [
                 {
-                    key: 'fudmo',
+                    key: nanoid(5),
                     text: '',
                     type: 'unstyled',
                     depth: 0,

package/package.json

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