@arquimedes.co/eureka-forms 1.9.134 → 2.0.1-test

package/dist/FormSteps/SmartSelectStep/MaterialSmartSelectStep/MaterialSmartSelectStep.d.ts

@@ -1,7 +1,10 @@
 /// <reference types="react" />
+import { FieldError } from 'react-hook-form';
 import { SmartSelectStepProps } from '../SmartSelectStep';
-export declare function SmartSelect({ icon, step, form, value, onBlur, errors, setFocus, children, editable, onChange, inputRef, postview, formStyle, getOptions, widthStats, organization, calcDepError, valueOverwrite, getValueString, originalValues, changeListener, dependencyStore, getValueWarning, getOptionSelected, setDependencyStore, ...others }: SmartSelectStepProps & {
-    onChange: Function;
+import { GSmartSelect } from '../../../@Types/GenericFormSteps';
+export declare function SmartSelect<StepType extends GSmartSelect>({ icon, step, value, error, onBlur, editable, onChange, inputRef, getOptions, calcDepError, valueOverwrite, getValueString, changeListener, getValueWarning, getOptionSelected, renderNestedSteps, }: SmartSelectStepProps<StepType> & {
+    error: FieldError | undefined;
+    onChange: any;
     onBlur: (event: any) => void;
     value: any;
     inputRef: any;

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

@@ -56,109 +56,83 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-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 { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import styles from './MaterialSmartSelectStep.module.css';
-import { Controller } from 'react-hook-form';
+import { useController, useFormContext } from 'react-hook-form';
 import { calcStepWidth } from '../../StepFunctions';
-import RoundedSmartSelect from '../../../shared/RoundedSmartSelect/RoundedSmartSelect';
-import { cloneElement, useEffect, useState } from 'react';
+import RoundedSmartSelect from '../../../Shared/RoundedSmartSelect/RoundedSmartSelect';
+import { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import React from 'react';
+import FormContext from '../../../Contexts/FormContext';
+import { selectBreakPoint, useAppDispatch, useAppSelector, } from '../../../hooks';
+import { focusStep, setEmptyDependency, } from '../../../States/SiteStateReducer';
+import { selectDependencies, useStepDependency } from '../../StepHooks';
 export function SmartSelect(_a) {
     var _this = this;
-    var _b, _c, _d, _e;
-    var icon = _a.icon, step = _a.step, form = _a.form, value = _a.value, onBlur = _a.onBlur, errors = _a.errors, setFocus = _a.setFocus, children = _a.children, editable = _a.editable, onChange = _a.onChange, inputRef = _a.inputRef, postview = _a.postview, formStyle = _a.formStyle, getOptions = _a.getOptions, widthStats = _a.widthStats, organization = _a.organization, calcDepError = _a.calcDepError, valueOverwrite = _a.valueOverwrite, getValueString = _a.getValueString, originalValues = _a.originalValues, changeListener = _a.changeListener, dependencyStore = _a.dependencyStore, getValueWarning = _a.getValueWarning, getOptionSelected = _a.getOptionSelected, setDependencyStore = _a.setDependencyStore, others = __rest(_a, ["icon", "step", "form", "value", "onBlur", "errors", "setFocus", "children", "editable", "onChange", "inputRef", "postview", "formStyle", "getOptions", "widthStats", "organization", "calcDepError", "valueOverwrite", "getValueString", "originalValues", "changeListener", "dependencyStore", "getValueWarning", "getOptionSelected", "setDependencyStore"]);
-    var _f = useState(true), first = _f[0], setFirst = _f[1];
-    var _g = useState(false), disabled = _g[0], setDisabled = _g[1];
-    var _h = useState(), options = _h[0], setOptions = _h[1];
-    var _j = useState(), error = _j[0], setError = _j[1];
-    var _k = useState(false), loading = _k[0], setLoading = _k[1];
-    var calcDependencies = function (idStep, deps) {
-        if (deps === void 0) { deps = []; }
-        var step = form.steps[idStep];
-        if (step === null || step === void 0 ? void 0 : step.dependencies) {
-            for (var _i = 0, _a = step.dependencies; _i < _a.length; _i++) {
-                var dep = _a[_i];
-                if (!deps.includes(dep)) {
-                    deps.push.apply(deps, __spreadArray(__spreadArray([], calcDependencies(dep, deps), false), [dep], false));
-                }
-            }
+    var _b, _c, _d, _e, _f, _g, _h;
+    var icon = _a.icon, step = _a.step, value = _a.value, error = _a.error, onBlur = _a.onBlur, editable = _a.editable, onChange = _a.onChange, inputRef = _a.inputRef, getOptions = _a.getOptions, calcDepError = _a.calcDepError, valueOverwrite = _a.valueOverwrite, getValueString = _a.getValueString, changeListener = _a.changeListener, getValueWarning = _a.getValueWarning, getOptionSelected = _a.getOptionSelected, renderNestedSteps = _a.renderNestedSteps;
+    var _j = useAppSelector(function (state) { return state.global; }), postview = _j.postview, formStyle = _j.formStyle, idOrganization = _j.idOrganization;
+    var form = useContext(FormContext);
+    var currentBreakPoint = useAppSelector(selectBreakPoint);
+    var _k = useState(), options = _k[0], setOptions = _k[1];
+    var _l = useState(false), loading = _l[0], setLoading = _l[1];
+    var _m = useState(true), firstTime = _m[0], setFirstTime = _m[1];
+    var _o = useState(false), touched = _o[0], setTouched = _o[1];
+    var dispatch = useAppDispatch();
+    var dependencyStore = useAppSelector(function (state) { return state.site.dependencies; });
+    var _p = useAppSelector(function (state) {
+        return selectDependencies(state, step, form);
+    }), emptyDep = _p.emptyDep, invalids = _p.invalids;
+    var _q = useFormContext(), getValues = _q.getValues, setFocus = _q.setFocus;
+    var isEmpty = useAppSelector(function (state) { var _a; return (_a = state.site.dependencies[step.id]) === null || _a === void 0 ? void 0 : _a.empty; });
+    var disabled = emptyDep;
+    useEffect(function () {
+        if (!postview) {
+            calcOptions(firstTime);
+            if (firstTime)
+                setFirstTime(false);
         }
-        return deps;
-    };
-    var calcInvalidDeps = function () {
-        var missingDeps = [];
-        for (var _i = 0, _a = calcDependencies(step.id); _i < _a.length; _i++) {
-            var idDep = _a[_i];
-            var dependency = dependencyStore[idDep];
-            if ((dependency === null || dependency === void 0 ? void 0 : dependency.value) === null) {
-                missingDeps.push(idDep);
-            }
+        else if (value && !step.searchable) {
+            setOptions([value]);
         }
-        return missingDeps;
-    };
-    var calcOptions = function (currentValue, invalidDeps) { return __awaiter(_this, void 0, void 0, function () {
-        var resp, currentOption, invalids, empty, error_1;
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+    }, (_c = (_b = step.dependencies) === null || _b === void 0 ? void 0 : _b.map(function (dep) { var _a; return (_a = dependencyStore[dep]) === null || _a === void 0 ? void 0 : _a.value; })) !== null && _c !== void 0 ? _c : []);
+    var calcOptions = function (firstTime) { return __awaiter(_this, void 0, void 0, function () {
+        var resp, newValue, empty, error_1;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
                     setOptions(undefined);
-                    _b.label = 1;
+                    if (value && !firstTime)
+                        setLoading(true);
+                    _a.label = 1;
                 case 1:
-                    _b.trys.push([1, 3, , 4]);
-                    return [4 /*yield*/, (getOptions === null || getOptions === void 0 ? void 0 : getOptions(organization, step, dependencyStore, others.domain))];
+                    _a.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, (getOptions === null || getOptions === void 0 ? void 0 : getOptions(idOrganization, step, dependencyStore))];
                 case 2:
-                    resp = _b.sent();
-                    if (resp !== null) {
-                        if (invalidDeps !== undefined && currentValue) {
-                            currentOption = resp.find(function (option) {
-                                return getOptionSelected(option, currentValue);
-                            });
-                            if (!currentOption) {
-                                setError('Este campo es obligatorio');
-                            }
-                        }
-                        else {
-                            invalids = calcInvalidDeps();
-                            if (invalids.length === 0) {
-                                setError(undefined);
-                            }
-                        }
-                        if (resp.length === 0) {
-                            setDependencyStore(function (dependencyStore) {
-                                var _a;
-                                return (__assign(__assign({}, dependencyStore), (_a = {}, _a[step.id] = {
-                                    type: step.type,
-                                    value: currentValue,
-                                    empty: true,
-                                }, _a)));
-                            });
-                        }
-                        else if ((_a = dependencyStore[step.id]) === null || _a === void 0 ? void 0 : _a.empty) {
-                            setDependencyStore(function (dependencyStore) {
-                                var _a;
-                                return (__assign(__assign({}, dependencyStore), (_a = {}, _a[step.id] = {
-                                    type: step.type,
-                                    value: currentValue,
-                                }, _a)));
+                    resp = _a.sent();
+                    if (value) {
+                        /** If the value is still valid select it */
+                        if (resp && getValueString(value) !== undefined) {
+                            newValue = resp.find(function (option) {
+                                return getValueString(option) === getValueString(value);
                             });
+                            onChange(newValue);
                         }
+                        else
+                            onChange(null);
                     }
-                    empty = calcDependencies(step.id).find(function (idDep) { var _a; return (_a = dependencyStore[idDep]) === null || _a === void 0 ? void 0 : _a.empty; });
-                    setDisabled(!!empty);
                     setOptions(resp);
+                    empty = resp === null ? undefined : resp.length === 0;
+                    /** Tell the dependency store this input is empty or not */
+                    if (empty !== !!isEmpty) {
+                        dispatch(setEmptyDependency({
+                            step: step,
+                            empty: empty,
+                        }));
+                    }
                     return [3 /*break*/, 4];
                 case 3:
-                    error_1 = _b.sent();
+                    error_1 = _a.sent();
                     console.error(error_1);
                     setOptions(null);
                     return [3 /*break*/, 4];
@@ -168,135 +142,81 @@ export function SmartSelect(_a) {
             }
         });
     }); };
-    useEffect(function () {
-        if (!postview) {
-            if (first) {
-                setFirst(false);
-                var invalids = calcInvalidDeps().filter(function (idDep) { return originalValues[idDep]; });
-                setError(calcDepError === null || calcDepError === void 0 ? void 0 : calcDepError(invalids.map(function (idDep) { return form.steps[idDep]; })));
-                calcOptions(value, invalids);
-            }
-            else {
-                if (value) {
+    var warning = useMemo(function () { return getValueWarning === null || getValueWarning === void 0 ? void 0 : getValueWarning(value); }, [value]);
+    var onFocus = useCallback(function () {
+        if (disabled)
+            return;
+        if (options === null && !(!editable || postview)) {
+            if (!value) {
+                if (invalids.length > 0) {
+                    var depStep = form.steps[invalids[0]];
+                    if (form.type === 'STEPPER' &&
+                        step.idSection !== depStep.idSection) {
+                        dispatch(focusStep({
+                            step: form.steps[invalids[0]],
+                            values: getValues(),
+                        }));
+                    }
+                    else {
+                        setFocus(invalids[0]);
+                    }
+                }
+                else if (value === undefined) {
                     setLoading(true);
-                    setOptions([]);
-                    onChange(null);
                 }
-                calcOptions(null);
             }
         }
-        else if (value && !step.searchable) {
-            setOptions([value]);
+        if (options === undefined && !(!editable || postview)) {
+            setLoading(true);
         }
-    }, (_c = (_b = step.dependencies) === null || _b === void 0 ? void 0 : _b.map(function (dep) { return dependencyStore[dep]; })) !== null && _c !== void 0 ? _c : []);
-    /**
-     * If the original value has no label search for it in the list.
-     */
-    useEffect(function () {
-        var original = originalValues[step.id];
-        if (original &&
-            options &&
-            getValueString(original) !== undefined &&
-            !original.label) {
-            var newValue = options.find(function (option) { return getValueString(option) === getValueString(original); });
-            onChange(newValue);
+        if (!touched)
+            setTouched(true);
+    }, [options, disabled, postview, editable, invalids, touched]);
+    var handleUpdate = useCallback(function (value) {
+        valueOverwrite ? onChange(valueOverwrite(value)) : onChange(value);
+    }, [valueOverwrite, onChange]);
+    var errorMsg = useMemo(function () {
+        if (invalids.length > 0 && touched) {
+            return calcDepError === null || calcDepError === void 0 ? void 0 : calcDepError(invalids.map(function (idDep) { return form.steps[idDep]; }));
         }
-    }, [originalValues[step.id], options]);
-    var handleMissingDep = function () { return __awaiter(_this, void 0, void 0, function () {
-        var invalids;
-        return __generator(this, function (_a) {
-            if (step.dependencies) {
-                invalids = calcInvalidDeps();
-                setError(calcDepError === null || calcDepError === void 0 ? void 0 : calcDepError(invalids
-                    .map(function (idDep) { return form.steps[idDep]; })
-                    .filter(function (idDep) { return idDep !== undefined; })));
-                if (!value) {
-                    if (invalids.length > 0) {
-                        setFocus(invalids[0]);
-                    }
-                    else {
-                        setLoading(true);
-                    }
-                }
+        else if (value && options) {
+            var currentOption = options.find(function (option) {
+                return getOptionSelected(option, value);
+            });
+            if (!currentOption) {
+                return 'Este campo es obligatorio';
             }
-            return [2 /*return*/];
-        });
-    }); };
-    var warning = getValueWarning === null || getValueWarning === void 0 ? void 0 : getValueWarning(value);
+        }
+        else if (options === null && invalids.length === 0) {
+            return 'Error al cargar las opciones';
+        }
+        return undefined;
+    }, [invalids, touched, value, options]);
     return (_jsxs(React.Fragment, { children: [_jsx("div", __assign({ className: styles.container, style: {
-                    width: widthStats.currentBreakPoint <= step.size
+                    width: currentBreakPoint <= step.size
                         ? '100%'
                         : calcStepWidth(step.size, form.size),
                     minHeight: step.description ||
                         (!postview && editable && step.required)
                         ? '55px'
                         : '43px',
-                }, onClick: function () {
-                    if (disabled)
-                        return;
-                    if (options === null && !(!editable || postview)) {
-                        handleMissingDep();
-                    }
-                    if (options === undefined && !(!editable || postview)) {
-                        setLoading(true);
-                    }
-                }, "data-testid": step.id }, { children: _jsx(RoundedSmartSelect, { value: value, onBlur: onBlur, onFocus: function () {
-                        if (disabled)
-                            return;
-                        if (options === null && !(!editable || postview)) {
-                            handleMissingDep();
-                        }
-                        if (options === undefined && !(!editable || postview)) {
-                            setLoading(true);
-                        }
-                    }, disabled: options === null || disabled, hidden: disabled, loading: loading, options: options !== null && options !== void 0 ? options : undefined, inputRef: inputRef, cantEdit: !editable || postview, fullWidth: true, backgroundColor: (_d = formStyle.stepBackgroundColor) !== null && _d !== void 0 ? _d : 'white', label: step.label, required: step.required, height: '31px', changeListener: changeListener, searchable: step.searchable, icon: step.showIcon ? icon : undefined, helperTextColor: formStyle.descriptionTextColor, focusColor: formStyle.primaryColor, outlineColor: formStyle.outlineColor, errorColor: formStyle.errorColor, color: formStyle.textColor, containerMargin: "0px", handleUpdate: function (value) {
-                        valueOverwrite
-                            ? onChange(valueOverwrite(value))
-                            : onChange(value);
-                        setError(undefined);
-                    }, getOptionSelected: getOptionSelected, getValueString: getValueString, helperText: (_e = error !== null && error !== void 0 ? error : warning) !== null && _e !== void 0 ? _e : (errors[step.id]
-                        ? errors[step.id].message
-                        : step.description), error: error !== undefined ||
-                        (warning !== undefined && warning !== null) ||
-                        !!errors[step.id] }) })), children &&
-                cloneElement(children, {
-                    value: value,
-                    stepProps: __assign({ step: step, form: form, errors: errors, setFocus: setFocus, postview: postview, editable: editable, formStyle: formStyle, widthStats: widthStats, organization: organization, originalValues: originalValues, dependencyStore: dependencyStore, setDependencyStore: setDependencyStore }, others),
-                })] }));
+                }, onClick: onFocus, "data-testid": step.id }, { children: _jsx(RoundedSmartSelect, { value: value, onBlur: onBlur, onFocus: onFocus, disabled: options === null || disabled, hidden: disabled, loading: loading, options: options !== null && options !== void 0 ? options : undefined, inputRef: inputRef, cantEdit: !editable || postview, fullWidth: true, backgroundColor: (_d = formStyle.stepBackgroundColor) !== null && _d !== void 0 ? _d : 'white', label: step.label, required: step.required, height: '31px', changeListener: changeListener, searchable: step.searchable, icon: step.showIcon ? icon : undefined, helperTextColor: formStyle.descriptionTextColor, focusColor: formStyle.primaryColor, outlineColor: formStyle.outlineColor, errorColor: formStyle.errorColor, color: formStyle.textColor, containerMargin: "0px", handleUpdate: handleUpdate, getOptionSelected: getOptionSelected, getValueString: getValueString, helperText: (_h = (_g = (_e = errorMsg !== null && errorMsg !== void 0 ? errorMsg : warning) !== null && _e !== void 0 ? _e : (_f = error === null || error === void 0 ? void 0 : error.message) === null || _f === void 0 ? void 0 : _f.toString()) !== null && _g !== void 0 ? _g : step.description) !== null && _h !== void 0 ? _h : undefined, error: !!errorMsg || !!warning || !!error }) })), renderNestedSteps === null || renderNestedSteps === void 0 ? void 0 : renderNestedSteps(value)] }));
 }
 function SmartSelectStep(props) {
-    var _a, _b;
-    var step = props.step, dependencyStore = props.dependencyStore, defaultValue = props.defaultValue, originalValues = props.originalValues;
-    useEffect(function () {
-        /** Al modificar tambien modificar en EntityValue */
-        if (!originalValues[step.id] && defaultValue) {
-            props.setDependencyStore(function (dependencies) {
-                var _a;
-                return (__assign(__assign({}, dependencies), (_a = {}, _a[step.id] = {
-                    type: step.type,
-                    value: props.defaultValue,
-                }, _a)));
-            });
-        }
-    }, []);
-    return (_jsx(Controller, { name: step.id, control: props.control, defaultValue: (_b = (_a = originalValues[step.id]) !== null && _a !== void 0 ? _a : defaultValue) !== null && _b !== void 0 ? _b : null, rules: {
-            required: step.required
-                ? 'Este campo es obligatorio'
-                : undefined,
-        }, shouldUnregister: true, render: function (_a) {
-            var _b = _a.field, ref = _b.ref, field = __rest(_b, ["ref"]);
-            return (_jsx(SmartSelect, __assign({}, props, field, { inputRef: ref, onChange: function (value) {
-                    if (dependencyStore[step.id] !== undefined) {
-                        props.setDependencyStore(function (dependencies) {
-                            var _a;
-                            return (__assign(__assign({}, dependencies), (_a = {}, _a[step.id] = {
-                                type: step.type,
-                                value: value !== null && value !== void 0 ? value : null,
-                            }, _a)));
-                        });
-                    }
-                    field.onChange(value);
-                } })));
-        } }));
+    var step = props.step, defaultValue = props.defaultValue;
+    var _a = useStepDependency(step, defaultValue), handleStepDep = _a.handleStepDep, originalValue = _a.originalValue;
+    var _b = useController({
+        name: step.id,
+        shouldUnregister: true,
+        rules: {
+            required: step.required ? 'Este campo es obligatorio' : undefined,
+        },
+        defaultValue: originalValue,
+    }), _c = _b.field, ref = _c.ref, field = __rest(_c, ["ref"]), error = _b.fieldState.error;
+    var onChange = useCallback(function (value) {
+        handleStepDep(value);
+        field.onChange(value);
+    }, [handleStepDep, field]);
+    return (_jsx(SmartSelect, __assign({}, props, field, { error: error, inputRef: ref, onChange: onChange })));
 }
 export default SmartSelectStep;

package/dist/FormSteps/SmartSelectStep/SmartSelectStep.d.ts

@@ -1,32 +1,31 @@
 /// <reference types="react" />
 import { StepProps } from '../Step';
 import { GSmartSelect } from '../../@Types/GenericFormSteps';
-import { Organization } from '../../@Types';
 import { FormStep } from '../../@Types/FormStep';
 import { DependencyStore } from '../../Form/Form';
-export interface SmartSelectStepProps extends Omit<StepProps, 'step'> {
+export interface SmartSelectStepProps<StepType extends GSmartSelect = GSmartSelect> extends Omit<StepProps, 'step'> {
     /** The SmartSelectStep to display */
-    step: GSmartSelect;
+    step: StepType;
     /** The icon to display */
     icon?: React.ReactNode;
     /** Function to call to get the options of the selector, return null if dependency is not met */
-    getOptions: (organization: Organization, step: GSmartSelect, dependencyStore: DependencyStore, domain?: string) => Promise<any[] | null>;
+    getOptions: (idOrganization: string | undefined, step: StepType, dependencyStore: DependencyStore) => Promise<any[] | null>;
     /** Function to determine the currently selected option */
     getOptionSelected: (option: any, value: any) => boolean;
     /** Function to determine the current value in string format */
-    getValueString: (value: any) => string;
+    getValueString: (value: any | undefined) => string;
     /** Function to if currently selected option has warning */
-    getValueWarning?: (value: any) => string | null;
-    /** Function that returns the error message based on the types of the missing Dependencies, undefined if no error msg */
-    calcDepError?: (types: FormStep[]) => string | undefined;
-    /** children to render */
-    children?: React.ReactElement<any, string>;
+    getValueWarning?: (value: any | undefined) => string | null;
+    /** Function that returns the error message based on the steps of the missing Dependencies, undefined if no error msg */
+    calcDepError?: (steps: FormStep[]) => string | undefined;
     /** Function that overwrites the value before setting it */
     valueOverwrite?: (value: any | null) => any;
     /** Function called on each value change */
     changeListener?: (value: any) => void;
     /** default Value to select */
     defaultValue?: any;
+    /** function called to render nested elements when selected */
+    renderNestedSteps?: (value: any) => JSX.Element;
 }
 declare function SmartSelectStep(props: SmartSelectStepProps): JSX.Element;
 export default SmartSelectStep;

package/dist/FormSteps/SmartSelectStep/SmartSelectStep.js

@@ -12,8 +12,10 @@ var __assign = (this && this.__assign) || function () {
 import { jsx as _jsx } from "react/jsx-runtime";
 import { FormStyleTypes } from '../../constants/FormStepTypes';
 import MaterialSmartSelectStep from './MaterialSmartSelectStep/MaterialSmartSelectStep';
+import { useAppSelector } from '../../hooks';
 function SmartSelectStep(props) {
-    switch (props.formStyle.type) {
+    var formStyle = useAppSelector(function (state) { return state.global; }).formStyle;
+    switch (formStyle.type) {
         case FormStyleTypes.MATERIAL:
         default: {
             return _jsx(MaterialSmartSelectStep, __assign({}, props));

package/dist/FormSteps/Step.d.ts

@@ -1,11 +1,10 @@
 /// <reference types="react" />
 import { FormStep } from '../@Types/FormStep';
-import { RecursiveData } from '../Form/Section/Section';
-export interface StepProps extends RecursiveData {
+export interface StepProps {
     step: FormStep;
-    handleSizeChange?: Function;
+    editable: boolean;
+    handleSizeChange?: () => void;
     level: number;
-    globalEditable: boolean;
 }
 declare function StepComponent({ step, ...props }: StepProps): JSX.Element;
 export default StepComponent;

package/dist/FormSteps/Step.js

@@ -38,22 +38,26 @@ import EntityValuePickerStep from './EntityValueStep/EntityValuePickerStep';
 import MapperStep from './MapperStep/MapperStep';
 import CollapsibleStep from './CollapsibleStep/CollapsibleStep';
 import ApiSelectorStep from './ApiSelectorStep/ApiSelectorStep';
+import CustomStep from './CustomStep';
+import { useAppSelector } from '../hooks';
+import { useContext } from 'react';
+import CustomContext from '../Contexts/CustomContext';
 function StepComponent(_a) {
-    var _b, _c;
+    var _b;
     var step = _a.step, props = __rest(_a, ["step"]);
     if (!step) {
-        console.error('Step not found!');
+        console.error('Step not found!', step);
         return _jsx("div", {});
     }
-    var customStep = props.customSteps[step.type];
-    var editable = props.globalEditable ? (_b = step.editable) !== null && _b !== void 0 ? _b : true : false;
-    if ((props.postview || !editable) &&
-        (props.partial || step.partial) &&
-        props.originalValues[step.id] === undefined) {
+    var _c = useAppSelector(function (state) { return state.global; }), postview = _c.postview, partial = _c.partial;
+    var customSteps = useContext(CustomContext).customSteps;
+    var customStep = customSteps[step.type];
+    var editable = props.editable ? (_b = step.editable) !== null && _b !== void 0 ? _b : true : false;
+    if ((postview || !editable) && (partial || step.partial)) {
         return _jsx("div", {});
     }
     if (customStep) {
-        return customStep.component(__assign(__assign(__assign({}, props), ((_c = customStep.componentProps) !== null && _c !== void 0 ? _c : {})), { step: step, editable: editable }));
+        return (_jsx(CustomStep, __assign({}, props, { step: step, editable: editable, customStep: customStep })));
     }
     switch (step.type) {
         case Types.TITLE: {

package/dist/FormSteps/StepFunctions.d.ts

@@ -1,5 +1,15 @@
 import { FormSize } from '../@Types/Form';
 import { ApiSelector, CheckBox, ClassifierSelector, EntityValuePicker, FormSelector, FormStep } from '../@Types/FormStep';
+import { CBRFormStep } from '../@Types/CBRFormStep';
 export declare function calcFillerSize(step: FormSelector | ClassifierSelector | EntityValuePicker | ApiSelector | CheckBox, steps: Record<string, FormStep>, values: Record<string, unknown>, size: FormSize): number;
 export declare function recursivelyCheckOpenSize(idStep: string, steps: Record<string, FormStep>, values: Record<string, any>): number;
 export declare const calcStepWidth: (stepSize: 1 | 2 | 3 | 4, size: FormSize) => number;
+export declare const calcDefaultValue: (step: FormStep | CBRFormStep) => any;
+export declare const iterateNestedSteps: (idStep: string, steps: Record<string, FormStep>, iteration: (step: FormStep) => void) => void;
+/**
+ * Utility function to handle the substeps of a step
+ * @param step step to calc the substeps
+ * @param idModifier optional modifier for the ids of the substeps and all other properties
+ * @returns list of the ids of the direct substeps of the step, if modifier returns modified steps
+ */
+export declare const calcSubSteps: (step: FormStep, idModifier?: ((idSubStep: string) => string) | undefined) => string[];