@arquimedes.co/eureka-forms 2.0.99 → 3.0.0-refactor

package/dist/FormSteps/SelectorStep/SelectorStep.js

@@ -1,24 +1,13 @@
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useAppSelector } from '../../hooks';
 import { FormStyleTypes } from '../../constants/FormStepTypes';
 import MaterialSelectorStep from './MaterialSelectorStep/MaterialSelectorStep';
 function SelectorStep(props) {
-    var formStyle = useAppSelector(function (state) { return state.global; }).formStyle;
+    const { formStyle } = useAppSelector((state) => state.global);
     switch (formStyle.type) {
         case FormStyleTypes.MATERIAL:
         default: {
-            return _jsx(MaterialSelectorStep, __assign({}, props));
+            return _jsx(MaterialSelectorStep, { ...props });
         }
     }
 }

package/dist/FormSteps/SeparatorStep/MaterialSeparatorStep/MaterialSeparatorStep.js

@@ -1,9 +1,8 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useAppSelector } from '../../../hooks';
 import styles from './MaterialSeparatorStep.module.css';
-function SeparatorStep(_a) {
-    var step = _a.step;
-    var formStyle = useAppSelector(function (state) { return state.global; }).formStyle;
+function SeparatorStep({ step }) {
+    const { formStyle } = useAppSelector((state) => state.global);
     return (_jsx("div", { className: styles.container, style: {
             backgroundColor: step.transparent
                 ? 'transparent'

package/dist/FormSteps/SeparatorStep/SeparatorStep.js

@@ -1,24 +1,13 @@
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useAppSelector } from '../../hooks';
 import { FormStyleTypes } from '../../constants/FormStepTypes';
 import MaterialSeparatorStep from './MaterialSeparatorStep/MaterialSeparatorStep';
 function SeparatorStep(props) {
-    var formStyle = useAppSelector(function (state) { return state.global; }).formStyle;
+    const { formStyle } = useAppSelector((state) => state.global);
     switch (formStyle.type) {
         case FormStyleTypes.MATERIAL:
         default: {
-            return _jsx(MaterialSeparatorStep, __assign({}, props));
+            return _jsx(MaterialSeparatorStep, { ...props });
         }
     }
 }

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

@@ -1,163 +1,97 @@
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useFormContext } from 'react-hook-form';
-import RoundedSmartSelect from '../../../Shared/RoundedSmartSelect/RoundedSmartSelect';
+import ErkSmartSelect from '../../../Shared/ErkSmartSelect/ErkSmartSelect';
 import { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import React from 'react';
 import FormContext from '../../../Contexts/FormContext';
 import { useAppDispatch, useAppSelector } from '../../../hooks';
 import { focusStep, setEmptyDependency } from '../../../States/SiteSlice';
-import { selectDependencies, selectStepDependencies, useFormStep, } from '../../StepHooks';
+import { selectDependencies, selectStepDependencies, useFormStep } from '../../StepHooks';
 import MaterialInputContainer from '../../Utils/MaterialInputContainer/MaterialInputContainer';
-function SmartSelectStep(_a) {
-    var _this = this;
-    var _b, _c, _d, _e, _f, _g, _h;
-    var icon = _a.icon, step = _a.step, editable = _a.editable, getOptions = _a.getOptions, calcDepError = _a.calcDepError, defaultValue = _a.defaultValue, filterOptions = _a.filterOptions, valueOverwrite = _a.valueOverwrite, getValueString = _a.getValueString, changeListener = _a.changeListener, getValueWarning = _a.getValueWarning, getOptionSelected = _a.getOptionSelected, _j = _a.getOptionsConditionsIdSteps, getOptionsConditionsIdSteps = _j === void 0 ? function () { return []; } : _j, renderNestedSteps = _a.renderNestedSteps;
-    var _k = useFormStep(step, {
+import { FormTypes } from '../../../constants/FormStepTypes';
+function SmartSelectStep({ step, editable, getOptions, calcDepError, defaultValue, filterOptions, IconComponent, valueOverwrite, getValueString, changeListener, getValueWarning, getOptionSelected, getOptionsConditionsIdSteps = () => [], renderNestedSteps, }) {
+    const { ref, value, error, field, onChange: handleChange, } = useFormStep(step, {
         sizeChange: true,
-        defaultValue: defaultValue !== null && defaultValue !== void 0 ? defaultValue : null,
+        defaultValue: defaultValue ?? null,
         rules: {
             required: step.required ? 'Este campo es obligatorio' : undefined,
         },
-    }), ref = _k.ref, value = _k.value, error = _k.error, field = _k.field, handleChange = _k.onChange;
-    var onChange = useCallback(function (value) {
-        return handleChange(valueOverwrite ? valueOverwrite(value) : value);
-    }, [handleChange, valueOverwrite]);
-    var _l = useAppSelector(function (state) { return state.global; }), postview = _l.postview, formStyle = _l.formStyle, idOrganization = _l.idOrganization;
-    var form = useContext(FormContext);
-    var _m = useState(), options = _m[0], setOptions = _m[1];
-    var _o = useState(false), loading = _o[0], setLoading = _o[1];
-    var _p = useState(true), firstTime = _p[0], setFirstTime = _p[1];
-    var _q = useState(false), touched = _q[0], setTouched = _q[1];
-    var dispatch = useAppDispatch();
-    var idDependencies = useMemo(function () { return getOptionsConditionsIdSteps(step); }, []);
-    var dependencies = useAppSelector(function (state) {
-        return selectDependencies(state, step.dependencies);
     });
-    var deps = useAppSelector(function (state) {
-        return selectDependencies(state, idDependencies);
-    });
-    var conditionDependencies = useMemo(function () { return deps; }, idDependencies.map(function (id) { return deps[id]; }));
-    var _r = useAppSelector(function (state) {
-        return selectStepDependencies(state, step, form);
-    }), emptyDep = _r.emptyDep, invalids = _r.invalids;
-    var _s = useFormContext(), getValues = _s.getValues, setFocus = _s.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 () {
+    const onChange = useCallback((value) => {
+        changeListener?.(value);
+        handleChange(valueOverwrite ? valueOverwrite(value) : value);
+    }, [handleChange, valueOverwrite, changeListener]);
+    const { postview, idOrganization } = useAppSelector((state) => state.global);
+    const form = useContext(FormContext);
+    const [options, setOptions] = useState();
+    const [loading, setLoading] = useState(false);
+    const [firstTime, setFirstTime] = useState(true);
+    const [touched, setTouched] = useState(false);
+    const dispatch = useAppDispatch();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    const idDependencies = useMemo(() => getOptionsConditionsIdSteps(step), []);
+    const dependencies = useAppSelector((state) => selectDependencies(state, step.dependencies));
+    const deps = useAppSelector((state) => selectDependencies(state, idDependencies));
+    const conditionDependencies = useMemo(() => deps, 
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    idDependencies.map((id) => deps[id]));
+    const { emptyDep, invalids } = useAppSelector((state) => selectStepDependencies(state, step, form));
+    const { getValues, setFocus } = useFormContext();
+    const isEmpty = useAppSelector((state) => state.site.dependencies[step.id]?.empty);
+    useEffect(() => {
         if (!postview && editable) {
-            calcOptions(firstTime);
+            void calcOptions(firstTime);
             if (firstTime)
                 setFirstTime(false);
         }
         else if (value && !step.searchable) {
             setOptions([value]);
         }
-    }, (_c = (_b = step.dependencies) === null || _b === void 0 ? void 0 : _b.map(function (dep) { var _a; return (_a = dependencies[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:
+    }, 
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    step.dependencies?.map((dep) => dependencies[dep]?.value) ?? []);
+    const calcOptions = async (firstTime) => {
+        if (!firstTime)
+            setOptions(undefined);
+        if (value && !firstTime)
+            setLoading(true);
+        try {
+            const resp = await getOptions?.(idOrganization, step, dependencies);
+            if (value) {
+                /** If the value is still valid select it */
+                if (resp && getValueString(value) !== undefined) {
+                    const newValue = resp.find((option) => getValueString(option) === getValueString(value));
                     if (!firstTime)
-                        setOptions(undefined);
-                    if (value && !firstTime)
-                        setLoading(true);
-                    _a.label = 1;
-                case 1:
-                    _a.trys.push([1, 3, , 4]);
-                    return [4 /*yield*/, (getOptions === null || getOptions === void 0 ? void 0 : getOptions(idOrganization, step, dependencies))];
-                case 2:
-                    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);
-                            });
-                            if (!firstTime)
-                                onChange(newValue !== null && newValue !== void 0 ? newValue : null);
-                        }
-                        else if (!firstTime)
-                            onChange(null);
-                    }
-                    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 = _a.sent();
-                    console.error(error_1);
-                    setOptions(null);
-                    return [3 /*break*/, 4];
-                case 4:
-                    setLoading(false);
-                    return [2 /*return*/];
+                        onChange(newValue ?? null);
+                }
+                else if (!firstTime)
+                    onChange(null);
+            }
+            setOptions(resp);
+            const empty = resp === null ? undefined : resp.length === 0;
+            /** Tell the dependency store this input is empty or not */
+            if (empty !== !!isEmpty) {
+                dispatch(setEmptyDependency({
+                    step,
+                    empty,
+                }));
             }
-        });
-    }); };
-    var warning = useMemo(function () { return getValueWarning === null || getValueWarning === void 0 ? void 0 : getValueWarning(value); }, [value]);
-    var onFocus = useCallback(function () {
-        if (disabled || !editable || postview)
+        }
+        catch (error) {
+            console.error(error);
+            setOptions(null);
+        }
+        setLoading(false);
+    };
+    const warning = useMemo(() => getValueWarning?.(value), [value, getValueWarning]);
+    const onFocus = useCallback(() => {
+        if (emptyDep || !editable || postview)
             return;
         if (options === null) {
             if (!value) {
                 if (invalids.length > 0) {
-                    var depStep = form.steps[invalids[0]];
-                    if (form.type === 'STEPPER' &&
-                        step.idSection !== depStep.idSection) {
+                    const depStep = form.steps[invalids[0]];
+                    if (form.type === FormTypes.STEPPER && step.idSection !== depStep.idSection) {
                         dispatch(focusStep({
                             step: form.steps[invalids[0]],
                             values: getValues(),
@@ -177,22 +111,22 @@ function SmartSelectStep(_a) {
         }
         if (!touched)
             setTouched(true);
-    }, [options, disabled, postview, editable, invalids, touched]);
-    var filteredOptions = useMemo(function () {
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [options, emptyDep, postview, editable, invalids, touched]);
+    const filteredOptions = useMemo(() => {
         if (!options || !filterOptions)
             return options;
         return filterOptions(options, conditionDependencies);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [options, conditionDependencies]);
-    var errorMsg = useMemo(function () {
+    const errorMsg = useMemo(() => {
         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]; }));
+            return calcDepError?.(invalids.map((idDep) => form.steps[idDep]));
         }
         else if (value && filteredOptions) {
-            var currentOption = filteredOptions.find(function (option) {
-                return getOptionSelected(option, value);
-            });
+            const currentOption = filteredOptions.find((option) => getOptionSelected(option, value));
             if (!currentOption) {
                 return 'Este campo es obligatorio';
             }
@@ -201,7 +135,8 @@ function SmartSelectStep(_a) {
             return 'Error al cargar las opciones';
         }
         return undefined;
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [invalids, touched, value, filteredOptions]);
-    return (_jsxs(React.Fragment, { children: [_jsx(MaterialInputContainer, __assign({ step: step, onClick: onFocus, editable: editable }, { children: _jsx(RoundedSmartSelect, __assign({}, field, { inputRef: ref, value: value, handleUpdate: onChange, onFocus: onFocus, disabled: filteredOptions === null || disabled, hidden: disabled, loading: loading, options: filteredOptions !== null && filteredOptions !== void 0 ? filteredOptions : undefined, 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", 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)] }));
+    return (_jsxs(React.Fragment, { children: [_jsx(MaterialInputContainer, { step: step, onClick: onFocus, editable: editable, children: _jsx(ErkSmartSelect, { ...field, value: value, inputRef: ref, onFocus: onFocus, loading: loading, label: step.label, onChange: onChange, required: step.required, searchable: step.searchable, getValueString: getValueString, disabled: filteredOptions === null || emptyDep, getOptionSelected: getOptionSelected, options: filteredOptions ?? undefined, IconComponent: step.showIcon ? IconComponent : undefined, error: !!errorMsg || !!warning || !!error, readOnly: !editable || postview || emptyDep, helperText: errorMsg ?? warning ?? error?.message?.toString() ?? step.description ?? undefined }) }), renderNestedSteps?.(value)] }));
 }
 export default SmartSelectStep;

package/dist/FormSteps/SmartSelectStep/SmartSelectStep.js

@@ -1,24 +1,13 @@
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 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) {
-    var formStyle = useAppSelector(function (state) { return state.global; }).formStyle;
+    const { formStyle } = useAppSelector((state) => state.global);
     switch (formStyle.type) {
         case FormStyleTypes.MATERIAL:
         default: {
-            return _jsx(MaterialSmartSelectStep, __assign({}, props));
+            return _jsx(MaterialSmartSelectStep, { ...props });
         }
     }
 }

package/dist/FormSteps/Step.js

@@ -1,25 +1,3 @@
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    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, Fragment as _Fragment } from "react/jsx-runtime";
 import FormStepTypes from '../constants/FormStepTypes';
 import SelectorStep from './SelectorStep/SelectorStep';
@@ -45,92 +23,85 @@ import CustomContext from '../Contexts/CustomContext';
 import { selectOriginalValue, useCondition } from './StepHooks';
 import TimePickerStep from './TimePickerStep/TimePickerStep';
 import PhoneInputStep from './PhoneInputStep/PhoneInputStep';
-function StepComponent(_a) {
-    var _b, _c;
-    var step = _a.step, props = __rest(_a, ["step"]);
+function StepComponent({ step, ...props }) {
+    const { postview, partial } = useAppSelector((state) => state.global);
+    const { customSteps, customClientInfoStep } = useContext(CustomContext);
+    const originalValue = useAppSelector((state) => selectOriginalValue(state, step));
+    const showStep = useCondition(step.condition);
     if (!step) {
         console.error('Step not found!', step);
         return _jsx("div", {});
     }
-    var _d = useAppSelector(function (state) { return state.global; }), postview = _d.postview, partial = _d.partial;
-    var _e = useContext(CustomContext), customSteps = _e.customSteps, customClientInfoStep = _e.customClientInfoStep;
-    var originalValue = useAppSelector(function (state) {
-        return selectOriginalValue(state, step);
-    });
-    var showStep = useCondition(step.condition);
     if (!showStep)
         return _jsx(_Fragment, {});
-    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) &&
-        originalValue === undefined) {
+    const customStep = customSteps[step.type];
+    const editable = props.editable ? (step.editable ?? true) : false;
+    if ((postview || !editable) && (partial || step.partial) && originalValue === undefined) {
         return _jsx("div", {});
     }
     if (customStep) {
-        return (_jsx(CustomStepComponent, __assign({}, props, { customComponent: customStep.component, customProps: customStep.componentProps, step: step, editable: editable })));
+        return (_jsx(CustomStepComponent, { ...props, customComponent: customStep.component, customProps: customStep.componentProps, step: step, editable: editable }));
     }
     if (customClientInfoStep && step.clientInfoType) {
-        return (_jsx(CustomStepComponent, __assign({}, props, { customComponent: customClientInfoStep, step: step, editable: editable })));
+        return (_jsx(CustomStepComponent, { ...props, customComponent: customClientInfoStep, step: step, editable: editable }));
     }
     switch (step.type) {
         case FormStepTypes.TITLE: {
-            return (_jsx(TitleStep, __assign({}, props, { step: step, editable: editable })));
+            return _jsx(TitleStep, { ...props, step: step, editable: editable });
         }
         case FormStepTypes.TIMEPICKER: {
-            return (_jsx(TimePickerStep, __assign({}, props, { step: step, editable: editable })));
+            return _jsx(TimePickerStep, { ...props, step: step, editable: editable });
         }
         case FormStepTypes.SELECTOR: {
-            return (_jsx(SelectorStep, __assign({}, props, { step: step, editable: editable })));
+            return _jsx(SelectorStep, { ...props, step: step, editable: editable });
         }
         case FormStepTypes.CHECKBOX: {
-            return (_jsx(CheckBoxStep, __assign({}, props, { step: step, editable: editable })));
+            return _jsx(CheckBoxStep, { ...props, step: step, editable: editable });
         }
         case FormStepTypes.CLASSIFIER_SELECTOR: {
-            return (_jsx(ClassifierSelectorStep, __assign({}, props, { step: step, editable: editable })));
+            return _jsx(ClassifierSelectorStep, { ...props, step: step, editable: editable });
         }
         case FormStepTypes.TEXTAREA: {
-            return (_jsx(TextAreaStep, __assign({}, props, { step: step, editable: editable })));
+            return _jsx(TextAreaStep, { ...props, step: step, editable: editable });
         }
         case FormStepTypes.TEXTINPUT: {
-            if (step.clientInfoType === 'cel' ||
-                ((_c = step.validation) === null || _c === void 0 ? void 0 : _c.type) === 'PHONE') {
-                return (_jsx(PhoneInputStep, __assign({}, props, { step: step, editable: editable })));
+            if (step.clientInfoType === 'cel' || step.validation?.type === 'PHONE') {
+                return _jsx(PhoneInputStep, { ...props, step: step, editable: editable });
             }
-            return (_jsx(TextInputStep, __assign({}, props, { step: step, editable: editable })));
+            return _jsx(TextInputStep, { ...props, step: step, editable: editable });
         }
         case FormStepTypes.DATEPICKER: {
-            return (_jsx(DatePickerStep, __assign({}, props, { step: step, editable: editable })));
+            return _jsx(DatePickerStep, { ...props, step: step, editable: editable });
         }
         case FormStepTypes.SEPARATOR: {
-            return (_jsx(SeparatorStep, __assign({}, props, { step: step, editable: editable })));
+            return _jsx(SeparatorStep, { ...props, step: step, editable: editable });
         }
         case FormStepTypes.FILEUPLOAD: {
-            return (_jsx(FileUploadStep, __assign({}, props, { step: step, editable: editable })));
+            return _jsx(FileUploadStep, { ...props, step: step, editable: editable });
         }
         case FormStepTypes.RATING: {
-            return (_jsx(RatingStep, __assign({}, props, { step: step, editable: editable })));
+            return _jsx(RatingStep, { ...props, step: step, editable: editable });
         }
         case FormStepTypes.COLLAPSIBLE: {
-            return (_jsx(CollapsibleStep, __assign({}, props, { step: step, editable: editable })));
+            return _jsx(CollapsibleStep, { ...props, step: step, editable: editable });
         }
         case FormStepTypes.ENTITYVALUEPICKER: {
-            return (_jsx(EntityValuePickerStep, __assign({}, props, { step: step, editable: editable })));
+            return _jsx(EntityValuePickerStep, { ...props, step: step, editable: editable });
         }
         case FormStepTypes.API_SELECTOR: {
-            return (_jsx(ApiSelectorStep, __assign({}, props, { step: step, editable: editable })));
+            return _jsx(ApiSelectorStep, { ...props, step: step, editable: editable });
         }
         case FormStepTypes.MAPPER: {
-            return (_jsx(MapperStep, __assign({}, props, { step: step, editable: editable })));
+            return _jsx(MapperStep, { ...props, step: step, editable: editable });
         }
         default:
             break;
     }
     if (step.type.startsWith('CBR')) {
-        return (_jsx(CBRStepMapper, __assign({}, props, { step: step, editable: editable })));
+        return _jsx(CBRStepMapper, { ...props, step: step, editable: editable });
     }
     else if (step.type.startsWith('AYF')) {
-        return (_jsx(AYFStepMapper, __assign({}, props, { step: step, editable: editable })));
+        return _jsx(AYFStepMapper, { ...props, step: step, editable: editable });
     }
     return _jsx("div", {});
 }