@arquimedes.co/eureka-forms 2.0.42 → 2.0.43

package/dist/App/AppFunctions.js

@@ -9,6 +9,15 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 import { nanoid } from 'nanoid';
 import StepTypes, { FormTypes } from '../constants/FormStepTypes';
 import { getRawText, stringToDraft } from '../Utils/DraftFunctions';
@@ -133,7 +142,7 @@ export var calcRecursiveCondition = function (condition, ids) {
     }
 };
 export var mapOriginalValue = function (step, value, values, form) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     if (!value)
         return value;
     switch (step === null || step === void 0 ? void 0 : step.type) {
@@ -152,8 +161,8 @@ export var mapOriginalValue = function (step, value, values, form) {
                 if (element.value) {
                     mappedElement.value = element.value;
                 }
-                for (var _g = 0, _h = Object.keys(step.steps); _g < _h.length; _g++) {
-                    var idStep = _h[_g];
+                for (var _h = 0, _j = Object.keys(step.steps); _h < _j.length; _h++) {
+                    var idStep = _j[_h];
                     var newIdStep = step.id + '-' + idStep + '-' + idElement;
                     mappedElement.ids[idStep] = newIdStep;
                     var value_1 = mapOriginalValue(step.steps[idStep], element[idStep], values, form);
@@ -163,8 +172,25 @@ export var mapOriginalValue = function (step, value, values, form) {
                         values.sections[step.idSection][newIdStep] = value_1;
                     }
                 }
-                for (var _j = 0, _k = Object.keys(element); _j < _k.length; _j++) {
-                    var key = _k[_j];
+                for (var _k = 0, _l = Object.values(step.steps); _k < _l.length; _k++) {
+                    var subStep = _l[_k];
+                    var dependencies = (_b = subStep.dependencies) !== null && _b !== void 0 ? _b : [];
+                    if (subStep.condition) {
+                        dependencies = __spreadArray(__spreadArray([], dependencies, true), calcNestedConditionSteps(subStep.condition), true).filter(function (item, i, ar) { return ar.indexOf(item) === i; });
+                    }
+                    for (var _m = 0, dependencies_1 = dependencies; _m < dependencies_1.length; _m++) {
+                        var idDep = dependencies_1[_m];
+                        var mappedIdDep = step.id + '-' + idDep + '-' + idElement;
+                        if (!values.sections[step.idSection][idDep] &&
+                            !values.global[mappedIdDep] &&
+                            element[idDep]) {
+                            values.global[mappedIdDep] = element[idDep];
+                            mappedElement.ids[idDep] = mappedIdDep;
+                        }
+                    }
+                }
+                for (var _o = 0, _p = Object.keys(element); _o < _p.length; _o++) {
+                    var key = _p[_o];
                     if (step.steps[key] || key === 'id')
                         continue;
                     mappedElement.originalValues[key] = element[key];
@@ -180,12 +206,12 @@ export var mapOriginalValue = function (step, value, values, form) {
                 }
                 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;
+            var defaultValue = (_c = value.value) !== null && _c !== void 0 ? _c : value;
             if (typeof defaultValue === 'string') {
                 return defaultValue;
             }
             else {
-                return (_c = defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.text) !== null && _c !== void 0 ? _c : '';
+                return (_d = defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.text) !== null && _d !== void 0 ? _d : '';
             }
         }
         case StepTypes.SELECTOR: {
@@ -195,9 +221,9 @@ export var mapOriginalValue = function (step, value, values, form) {
             return value;
         }
         case StepTypes.CLASSIFIER_SELECTOR: {
-            var stepClassifier = (_d = form === null || form === void 0 ? void 0 : form.classifiers) === null || _d === void 0 ? void 0 : _d[(_e = step.idClassifier) !== null && _e !== void 0 ? _e : ''];
+            var stepClassifier = (_e = form === null || form === void 0 ? void 0 : form.classifiers) === null || _e === void 0 ? void 0 : _e[(_f = step.idClassifier) !== null && _f !== void 0 ? _f : ''];
             if (stepClassifier && !value.value) {
-                var classifier = (_f = form.classifiers) === null || _f === void 0 ? void 0 : _f[value];
+                var classifier = (_g = form.classifiers) === null || _g === void 0 ? void 0 : _g[value];
                 return { value: value, label: classifier === null || classifier === void 0 ? void 0 : classifier.name };
             }
             break;
@@ -211,6 +237,22 @@ export var mapOriginalValue = function (step, value, values, form) {
             return value;
     }
 };
+function calcNestedConditionSteps(condition) {
+    var steps = [];
+    if (!condition)
+        return steps;
+    switch (condition.type) {
+        case ConditionTypes.EXPRESSION:
+            return condition.conditions
+                .map(function (condition) { return calcNestedConditionSteps(condition); })
+                .flat();
+        case ConditionTypes.FORM_STEP:
+            return [condition.idStep];
+        default:
+            break;
+    }
+    return steps;
+}
 export var calcInitialSections = function (form) {
     var previousSections = [];
     var nextSections = calcNextSections(form.firstSection, form);

package/dist/Form/FormFunctions.js

@@ -191,8 +191,9 @@ function calcStepDependency(idStep, steps, values, customSteps) {
     var _a;
     var depStep = steps[idStep];
     if (!depStep) {
-        console.error('Missing Step Dependency:', idStep);
         var originalValue_1 = values.global[idStep];
+        if (!originalValue_1)
+            console.error('Missing Step Dependency:', idStep);
         return {
             type: originalValue_1 ? 'ORIGINAL' : 'MISSING',
             value: originalValue_1 !== null && originalValue_1 !== void 0 ? originalValue_1 : null,

package/dist/FormSteps/CollapsibleStep/MaterialTitleStep/MaterialCollapsibleStep.js

@@ -22,7 +22,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import { createElement as _createElement } from "react";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import React, { useContext, useEffect } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import styles from './MaterialCollapsibleStep.module.css';
 import { Controller, useFormContext } from 'react-hook-form';
 import StepComponent from '../../Step';
@@ -31,8 +31,9 @@ import ExpandLessRoundedIcon from '@material-ui/icons/ExpandLessRounded';
 import FormContext from '../../../Contexts/FormContext';
 import { useAppSelector } from '../../../hooks';
 function Collapsible(_a) {
-    var _b, _c, _d, _e;
+    var _b, _c, _d;
     var step = _a.step, open = _a.open, setOpen = _a.setOpen, others = __rest(_a, ["step", "open", "setOpen"]);
+    var _e = useState(true), firstTime = _e[0], setFirstTime = _e[1];
     var formStyle = useAppSelector(function (state) { return state.global; }).formStyle;
     var form = useContext(FormContext);
     var errors = useFormContext().formState.errors;
@@ -47,15 +48,19 @@ function Collapsible(_a) {
                     color: formStyle.textColor,
                     borderColor: formStyle.primaryColor,
                 } }, { children: [_jsx("div", __assign({ className: styles.collapsibleLabel, onClick: function () {
+                            if (firstTime)
+                                setFirstTime(false);
                             setOpen(!open);
                         } }, { children: step.label })), _jsx("div", __assign({ className: styles.expand, onClick: function () {
+                            if (firstTime)
+                                setFirstTime(false);
                             setOpen(!open);
                         } }, { children: _jsx("div", __assign({ className: styles.expandIcon }, { children: open ? (_jsx(ExpandLessRoundedIcon, { fontSize: "inherit" })) : (_jsx(ExpandMoreRoundedIcon, { fontSize: "inherit" })) })) }))] })), _jsx("div", __assign({ className: styles.content, style: {
-                    height: open === 'TRUE'
-                        ? 'auto'
-                        : open
-                            ? (_e = (_d = contentRef.current) === null || _d === void 0 ? void 0 : _d.offsetHeight) !== null && _e !== void 0 ? _e : 'auto'
-                            : 0,
+                    height: open
+                        ? firstTime
+                            ? 'auto'
+                            : (_d = contentRef.current) === null || _d === void 0 ? void 0 : _d.offsetHeight
+                        : 0,
                 } }, { children: _jsx("div", __assign({ className: styles.contentContainer, ref: contentRef }, { children: step.steps.map(function (idSubStep) {
                         var subStep = form.steps[idSubStep];
                         return (_createElement(StepComponent, __assign({}, others, { step: subStep, key: idSubStep })));
@@ -67,7 +72,7 @@ function CollapsibleStep(props) {
     var _a;
     var postview = useAppSelector(function (state) { return state.global; }).postview;
     var _b = useFormContext(), clearErrors = _b.clearErrors, errors = _b.formState.errors;
-    return (_jsx(Controller, { name: props.step.id, defaultValue: ((_a = props.step.defaultValue) !== null && _a !== void 0 ? _a : postview) ? false : true, render: function (_a) {
+    return (_jsx(Controller, { name: props.step.id, defaultValue: (_a = props.step.defaultValue) !== null && _a !== void 0 ? _a : (postview ? false : true), render: function (_a) {
             var _b = _a.field, value = _b.value, onChange = _b.onChange;
             return (_jsx(Collapsible, __assign({}, props, { open: value, setOpen: function (open) {
                     var _a;

package/dist/FormSteps/CollapsibleStep/MaterialTitleStep/MaterialCollapsibleStep.module.css

@@ -60,3 +60,9 @@
     margin-bottom: 10px;
     border-radius: 20px;
 }
+
+@media print {
+    .content {
+        height: auto !important;
+    }
+}

package/dist/FormSteps/StepFunctions.js

@@ -300,6 +300,7 @@ export var evaluateCondition = function (condition, dependencies) {
                     return boolFactor;
                 return !boolFactor;
             }
+            var dependency = dependencies[condition.idStep];
             var value = dependencies[condition.idStep].value;
             switch (condition.stepType) {
                 // case FormStepTypes.AGENTPICKER:
@@ -332,11 +333,12 @@ export var evaluateCondition = function (condition, dependencies) {
                     }
                 }
                 case FormStepTypes.SELECTOR: {
+                    var val = dependency.type === 'ORIGINAL' ? value : value.value;
                     if (condition.operator === OperatorTypes.EQUAL) {
-                        return condition.value === (value === null || value === void 0 ? void 0 : value.value);
+                        return condition.value === val;
                     }
                     else {
-                        return !(condition.value === (value === null || value === void 0 ? void 0 : value.value));
+                        return !(condition.value === val);
                     }
                 }
                 case FormStepTypes.TEXTINPUT: {

package/package.json

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