@redneckz/wildless-cms-uni-blocks 0.14.738 → 0.14.740

package/bundle/bundle.umd.js

@@ -2767,7 +2767,7 @@
         return (jsx("div", { className: "py-m gap-m grid @xl:flex @xl:items-center", children: jsx(RadioButtonGroup, { className: "whitespace-normal", orientation: "horizontal", items: VED_TYPES, ...field(input?.name ?? '', { onChange: handleChange }) }) }));
     });
 
-    function isRenderField({ input, field, }) {
+    function shouldRenderField({ input, field, }) {
         const { condition } = input;
         const { value } = field(condition?.name || '');
         return !condition || condition?.values?.find((_) => _ === (value?.key ?? value));
@@ -2810,11 +2810,11 @@
         comment: CommentField,
     };
     const getField = (field, params, externalInputs = {}) => (input, i) => {
-        const resultInputsMap = {
+        const fieldsRegister = {
             ...InputsMap$1,
             ...externalInputs,
         };
-        return isRenderField({ input, field }) ? (jsx("div", { children: resultInputsMap[input?.name || '']?.({ field, input, params }) }, String(i))) : null;
+        return (shouldRenderField({ input, field }) && (jsx("div", { children: fieldsRegister[String(input.name)]?.({ field, input, params }) }, i)));
     };
 
     const inputColumnStyles = (column) => column === 2 ? '@xl:grid-cols-2' : '';
@@ -4471,7 +4471,7 @@
             ?.some((_) => Boolean(withValidator(field(_?.name), validatorObj[_?.name]).error)), [inputs]);
         return (jsx("div", { className: "w-fit", children: jsx(Foldable, { isFoldButtonOnTop: true, unfoldedByDefault: true, renderFoldableSection: ({ isUnfolded }) => (jsx(FoldableSection, { isUnfolded: isUnfolded, className: "flex flex-col pl-2xl", children: 
                     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-                    inputs.map(getField(field, {}, InputsConsentsMap)) })), renderFoldButton: renderGeneralCheckbox(jsxs("div", { children: [jsx(Checkbox, { value: isChecked, onChange: handleGeneralToggle, text: CONSENT_ALL_DOCS_TEXT }, key), renderErrorText(hasValidationErrors ? CONSENT_REQUIRED : '')] })) }) }));
+                    inputs.map(getField(field, {}, { ...InputsConsentsMap })) })), renderFoldButton: renderGeneralCheckbox(jsxs("div", { children: [jsx(Checkbox, { value: isChecked, onChange: handleGeneralToggle, text: CONSENT_ALL_DOCS_TEXT }, key), renderErrorText(hasValidationErrors ? CONSENT_REQUIRED : '')] })) }) }));
     });
     const renderGeneralCheckbox = (generalCheckBox) => (foldableData) => (jsxs("div", { className: "flex items-start", children: [generalCheckBox, jsx("button", { onClick: foldableData.onToggle, className: "px-m py-2xs", type: "button", children: jsx(Icon, { className: "text-primary-text", name: foldableData.isUnfolded ? 'ArrowUpIcon' : 'ArrowDownIcon', width: "16", height: "16" }) })] }));
 
@@ -4479,9 +4479,9 @@
         const { consentInputs, restInputs } = splitInputs(inputs || []);
         return consentInputs.length > 2 ? (jsxs("div", { children: [restInputs.map(getField(field, {}, { ...InputsApplicationLeadMap })), jsx(GroupedConsents, { inputs: consentInputs, field: field })] })) : ((inputs || [])?.map(getField(field, {}, { ...InputsApplicationLeadMap })));
     };
-    const splitInputs = (inputs) => ({
-        consentInputs: inputs?.filter((_) => Object.keys(CONSENTS).includes(_.name || '')) || [],
-        restInputs: inputs?.filter((_) => !Object.keys(CONSENTS).includes(_.name || '')) || [],
+    const splitInputs = (inputs = []) => ({
+        consentInputs: inputs.filter(({ name }) => Object.keys(CONSENTS).includes(String(name))),
+        restInputs: inputs.filter(({ name }) => !Object.keys(CONSENTS).includes(String(name))),
     });
 
     const renderSubmitButton = (button, isSending) => (jsx(Button, { className: style('w-full @xl:w-auto'), type: "submit", isLoading: isSending, children: button?.text ? button.text : 'Отправить заявку' }));
@@ -6808,33 +6808,6 @@
         return (jsx("div", { className: "py-lg px-5xl bg-white col-span-12", children: jsxs("div", { children: [jsxs("span", { className: "font-bold mr-s", children: ["\u0428\u0430\u0433 ", step + 1, " \u0438\u0437 ", totalSteps, "."] }), stepsTitles[step] || null, jsx(ProgressBar, { step: progress, showPercentage: false })] }) }));
     });
 
-    const calculateInputs = (getValue) => (inputs, step) => inputs
-        .filter((_) => _)
-        .map((_) => {
-        if ([
-            checkIsRetiree(step, getValue),
-            checkBusinessOwner(_, getValue),
-            checkConsentPfrFlg(_, getValue),
-            checkAddressFillFromESIA(_, getValue),
-            checkAddressFact(_, getValue),
-            checkCondition(_, getValue),
-        ].some(Boolean)) {
-            return { ..._, required: false };
-        }
-        return _;
-    });
-    const checkIsRetiree = (step, getValue) => step === 2 && getValue('employment')?.key === 'RETIREE';
-    const checkBusinessOwner = ({ name }, getValue) => name === 'partInBusiness' && getValue('positionOrganization')?.key !== 'BUSINESS_OWNER';
-    const checkAddressFillFromESIA = ({ name, filledByEsia }, getValue) => name?.startsWith('address') && getValue('esiaAccountTypeCd')?.key && filledByEsia;
-    const checkAddressFact = ({ name }, getValue) => name === 'addressFact' && getValue('addressMatch');
-    const checkCondition = ({ condition }, getValue) => condition?.name &&
-        condition?.values?.some((_) => {
-            const dataValue = getValue(condition?.name);
-            return _ !== (dataValue?.key ?? dataValue);
-        });
-    const checkConsentPfrFlg = ({ name }, getValue) => name === 'snils' && isSnilsRequired(getValue);
-    const isSnilsRequired = (getValue) => getValue('confirmationIncome')?.key !== 'PFR_CERTIFICATE';
-
     var STATUS_TYPE;
     (function (STATUS_TYPE) {
         STATUS_TYPE["process"] = "IN_PROCESS";
@@ -6992,6 +6965,33 @@
         return statusesMap[status] || jsx(ReworkStatusContent$1, {});
     };
 
+    const calculateInputs = (getValue) => (inputs, step) => inputs
+        .filter((_) => _)
+        .map((_) => {
+        if ([
+            checkIsRetiree(step, getValue),
+            checkBusinessOwner(_, getValue),
+            checkConsentPfrFlg(_, getValue),
+            checkAddressFillFromESIA(_, getValue),
+            checkAddressFact(_, getValue),
+            checkCondition(_, getValue),
+        ].some(Boolean)) {
+            return { ..._, required: false };
+        }
+        return _;
+    });
+    const checkIsRetiree = (step, getValue) => step === 2 && getValue('employment')?.key === 'RETIREE';
+    const checkBusinessOwner = ({ name }, getValue) => name === 'partInBusiness' && getValue('positionOrganization')?.key !== 'BUSINESS_OWNER';
+    const checkAddressFillFromESIA = ({ name, filledByEsia }, getValue) => name?.startsWith('address') && getValue('esiaAccountTypeCd')?.key && filledByEsia;
+    const checkAddressFact = ({ name }, getValue) => name === 'addressFact' && getValue('addressMatch');
+    const checkCondition = ({ condition }, getValue) => condition?.name &&
+        condition?.values?.some((_) => {
+            const dataValue = getValue(condition?.name);
+            return _ !== (dataValue?.key ?? dataValue);
+        });
+    const checkConsentPfrFlg = ({ name }, getValue) => name === 'snils' && isSnilsRequired(getValue);
+    const isSnilsRequired = (getValue) => getValue('confirmationIncome')?.key !== 'PFR_CERTIFICATE';
+
     const InputsMap = { ...InputsRetailMap, ...InputRetailCardMap };
     const renderInputs$1 = ({ field, inputs, params }) => inputs.map(getField(field, params, InputsMap));
 
@@ -7298,10 +7298,7 @@
                     }));
                     resetForm(response);
                 }
-                onNextStep();
-                if (isFinalStep) {
-                    onFinish?.();
-                }
+                isFinalStep ? onFinish?.() : onNextStep();
             }
             catch (ex) {
                 // Do nothing
@@ -7313,8 +7310,8 @@
         return [initialState, handleSubmit, isSending];
     };
 
-    const CreditCardFormStep = JSX(({ step, sections, isFormFinished, onPrevStep, onNextStep, onFinish }) => {
-        const inputs = useMemo(() => (sections?.flatMap((_) => _?.inputs) || []), [sections]);
+    const CreditCardFormStep = JSX(({ step, sections, onPrevStep, onNextStep, onFinish }) => {
+        const inputs = useMemo(() => sections?.flatMap((_) => _?.inputs || []), [sections]);
         const formValidator = useCallback((formState) => 
         // TODO Слишком сложно
         getFormValidator(calculateInputs((_) => formState[_])(inputs, step))(formState), [inputs]);
@@ -7327,7 +7324,7 @@
             formValidator,
             onSubmit,
         });
-        return isFormFinished ? (jsx(CreditCardFormStatusTracker, {})) : (jsxs("form", { onSubmit: handleSubmit, className: "space-y-m", children: [renderStep$2({ sections, field, step }), jsx(StepsNavigationButtons$1, { isSending: isSending, step: step, onPrevStep: onPrevStep })] }));
+        return (jsxs("form", { onSubmit: handleSubmit, className: "space-y-m", children: [renderStep$2({ sections, field, step }), jsx(StepsNavigationButtons$1, { isSending: isSending, step: step, onPrevStep: onPrevStep })] }));
     });
 
     const PERSONAL_INFO_CONTENT = [
@@ -7731,7 +7728,7 @@
         }, []);
         const sections = stepsSectionsMap$1[step];
         const [isFormFinished, { setTrue: handleFinish }] = useBool(false);
-        return (jsx(BlockWrapper, { className: className, ...rest, children: jsxs("div", { ref: formContainerRef, className: "container grid grid-cols-12", children: [isFormFinished ? null : (jsx(CreditCardFormProgress, { stepsTitles: TITLES, step: step, totalSteps: STEPS$1 })), jsx("div", { className: "py-lg px-5xl mt-2xs bg-white col-span-12", children: jsx(CreditCardFormStep, { step: step, sections: sections, isFormFinished: isFormFinished, onNextStep: handleNextStep, onPrevStep: handlePrevStep, onFinish: handleFinish }, String(step)) })] }) }));
+        return (jsx(BlockWrapper, { className: className, ...rest, children: jsxs("div", { ref: formContainerRef, className: "container grid grid-cols-12", children: [isFormFinished ? null : (jsx(CreditCardFormProgress, { stepsTitles: TITLES, step: step, totalSteps: STEPS$1 })), jsx("div", { className: "py-lg px-5xl mt-2xs bg-white col-span-12", children: isFormFinished ? (jsx(CreditCardFormStatusTracker, {})) : (jsx(CreditCardFormStep, { step: step, sections: sections, onNextStep: handleNextStep, onPrevStep: handlePrevStep, onFinish: handleFinish }, String(step))) })] }) }));
     });
 
     const CreditFormProgress = JSX(({ step = 1, totalSteps = 5, stepsTitles = [] }) => {
@@ -8105,10 +8102,10 @@
         return [initialState, handleSubmit, isSending];
     };
 
-    const CreditFormStep = JSX(({ step, sections, isFormFinished, programsSource, onPrevStep, onNextStep, onFinish }) => {
+    const CreditFormStep = JSX(({ step, sections, programsSource, onPrevStep, onNextStep, onFinish }) => {
         const { programId } = useRetailFormStore();
         const calcData = programsSource?.[programId ?? '']; // Need normalizator useForm, to be save defaultParams
-        const inputs = useMemo(() => (sections?.flatMap((_) => _?.inputs) || []), [sections]);
+        const inputs = useMemo(() => sections?.flatMap((_) => _?.inputs ?? []), [sections]);
         const formValidator = useCallback((formState) => 
         // TODO Слишком сложно
         getFormValidator(calculateInputs((_) => formState[_])(inputs, step))(formState), [inputs]);
@@ -8121,7 +8118,7 @@
             formValidator,
             onSubmit,
         });
-        return isFormFinished ? (jsx(CreditFormStatusTracker, {})) : (jsxs("form", { onSubmit: handleSubmit, className: "space-y-m", children: [renderStep$1({ sections, field, step, params: { calcData } }), jsx(StepsNavigationButtons, { step: step, isSending: isSending, onPrevStep: onPrevStep })] }));
+        return (jsxs("form", { onSubmit: handleSubmit, className: "space-y-m", children: [renderStep$1({ sections, field, step, params: { calcData } }), jsx(StepsNavigationButtons, { step: step, isSending: isSending, onPrevStep: onPrevStep })] }));
     });
 
     const stepsSectionsMap = [
@@ -8156,7 +8153,7 @@
         const sections = stepsSectionsMap[step];
         const isStartStep = step === 0;
         const [isFormFinished, { setTrue: handleFinish }] = useBool(false);
-        return (jsx(BlockWrapper, { className: className, ...rest, children: jsxs("div", { ref: formContainerRef, className: "container grid grid-cols-12", children: [isStartStep || isFormFinished ? null : (jsx(CreditFormProgress, { stepsTitles: STEP_TITLES, step: step, totalSteps: STEPS })), jsx("div", { className: "py-lg px-5xl mt-2xs bg-white col-span-12", children: jsx(CreditFormStep, { step: step, sections: sections, isFormFinished: isFormFinished, programsSource: programsSource, onNextStep: handleNextStep, onPrevStep: handlePrevStep, onFinish: handleFinish }, String(step)) })] }) }));
+        return (jsx(BlockWrapper, { className: className, ...rest, children: jsxs("div", { ref: formContainerRef, className: "container grid grid-cols-12", children: [isStartStep || isFormFinished ? null : (jsx(CreditFormProgress, { stepsTitles: STEP_TITLES, step: step, totalSteps: STEPS })), jsx("div", { className: "py-lg px-5xl mt-2xs bg-white col-span-12", children: isFormFinished ? (jsx(CreditFormStatusTracker, {})) : (jsx(CreditFormStep, { step: step, sections: sections, programsSource: programsSource, onNextStep: handleNextStep, onPrevStep: handlePrevStep, onFinish: handleFinish }, String(step))) })] }) }));
     });
 
     const isRateRow = (rateRow) => typeof rateRow?.minMonths === 'number' && typeof rateRow?.maxMonths === 'number';
@@ -10433,7 +10430,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.737";
+    const packageVersion = "0.14.739";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;