@redneckz/wildless-cms-uni-blocks 0.14.838 → 0.14.840

package/mobile/bundle/bundle.umd.js

@@ -1304,20 +1304,24 @@
 
     const renderErrorText = (error) => (jsx("div", { className: "h-6", children: error ? (jsx(Text, { size: "text-xs", font: "font-light", color: "text-error", children: error })) : null }));
 
-    const InputControl = JSX(({ className, label, value = '', placeholder, error, errors, onChange = noop, onBlur, isTextarea, type, isInteger = false, maxLength, disabled = false, }) => {
-        const [isOpen, { setFalse: close, setTrue: open }] = useBool();
-        const popupRef = useOutsideClick(close);
+    const InputWrapper = JSX(({ className, label, value = '', error, errors, type, isInteger, placeholder, maxLength, inputRef, isOpen, onOpen, onClose, onChange = noop, ...rest }) => {
+        const popupRef = useOutsideClick(onClose);
         const handleChange = useCallback((v) => {
-            !isOpen && open();
-            maxLength ? v.length <= maxLength && onChange(v) : onChange(v);
+            const isOverMax = maxLength && v.length > maxLength;
+            !isOpen && onOpen();
+            if (!isOverMax) {
+                onChange(normalizeInteger(v, isInteger));
+            }
         }, [isOpen, onChange]);
-        useEffect(() => {
-            isInteger && value ? onChange(normalizeInteger$1(value)) : null;
-        }, [value]);
-        return (jsxs("div", { className: style('shrink-0 w-full', className), ref: popupRef, onBlur: close, onFocus: open, children: [jsx("div", { children: jsx(Input, { disabled: disabled, type: type || 'text', "aria-label": label, label: getRequiredLabel({ label, errors }), valid: Boolean(!error), value: value, onChange: handleChange, onBlur: onBlur, isTextarea: isTextarea, placeholder: getPlaceholder$1(placeholder, errors, label) }) }), renderErrorText(error)] }));
+        return (jsxs("div", { className: style('shrink-0 w-full', className), ref: popupRef, onBlur: onClose, onFocus: onOpen, children: [jsx("div", { ref: inputRef, children: jsx(Input, { type: type || 'text', "aria-label": label, label: getRequiredLabel({ label, errors }), valid: Boolean(!error), onChange: handleChange, placeholder: getPlaceholder({ placeholder, errors, label }), value: value, ...rest }) }), renderErrorText(error)] }));
+    });
+    const normalizeInteger = (val = '', isInteger = false) => isInteger && val ? val.replace(/[^\d]+/g, '') : val;
+    const getPlaceholder = ({ placeholder, errors, label }) => errors && !label ? `${placeholder}*` : placeholder;
+
+    const InputControl = JSX((props) => {
+        const [isOpen, { setFalse: close, setTrue: open }] = useBool();
+        return jsx(InputWrapper, { isOpen: isOpen, onOpen: open, onClose: close, ...props });
     });
-    const normalizeInteger$1 = (val = '') => val.replace(/[^\d]+/g, '');
-    const getPlaceholder$1 = (placeholder, errors, label) => errors && !label ? `${placeholder}*` : placeholder;
 
     const formatOption = (_) => _?.text || _?.key || '';
 
@@ -2075,7 +2079,7 @@
         };
     };
 
-    const cyrillicPattern = /^[\u0400-\u04FF\d\s]+$/u;
+    const cyrillicPattern = /^[а-яё-]*$/i;
     const isCyrillic = (_ = '') => cyrillicPattern.test(_);
 
     const required = validator((_) => _ !== null && _ !== undefined && _ !== '');
@@ -2110,7 +2114,7 @@
         sufferedFrom: defaultValidator(),
         applierType: defaultValidator(),
         surname: nameValidator('Укажите свою фамилию на кириллице'),
-        name: nameValidator('Укажите своё имя на кириллице'),
+        name: nameValidator('Укажите своё имя на кириллице (без сокращений)'),
         middleName: nameValidator('Укажите своё отчество на кириллице'),
         birthday: defaultValidator('Укажите дату рождения'),
         phone: phoneValidator('Укажите номер телефона'),
@@ -2943,16 +2947,8 @@
         return inputRef;
     }
 
-    const DaDataInputControl = JSX(({ className, label, value = '', placeholder, error, errors, onChange = noop, onDaDataChange, onBlur, isTextarea, type, name = '', daDataQueryPrefix, isInteger = false, maxLength, dadata = false, disabled = false, }) => {
+    const DaDataInputControl = JSX(({ value = '', onChange = noop, onDaDataChange, name = '', daDataQueryPrefix, dadata = false, ...rest }) => {
         const [isOpen, { setFalse: close, setTrue: open }] = useBool();
-        const popupRef = useOutsideClick(close);
-        const handleChange = useCallback((v) => {
-            dadata && !isOpen && open();
-            maxLength ? v.length <= maxLength && onChange(v) : onChange(v);
-        }, [isOpen, onChange]);
-        useEffect(() => {
-            isInteger && value && onChange(normalizeInteger(value));
-        }, [value]);
         const inputRef = useInputPopup({
             isOpen: isOpen && dadata,
             name,
@@ -2961,10 +2957,8 @@
             onChange,
             onDaDataChange,
         });
-        return (jsxs("div", { className: style('shrink-0 w-full', className), ref: popupRef, onBlur: close, onFocus: open, children: [jsx("div", { ref: inputRef, children: jsx(Input, { disabled: disabled, type: type || 'text', "aria-label": label, label: getRequiredLabel({ label, errors }), valid: Boolean(!error), value: value, onChange: handleChange, onBlur: onBlur, isTextarea: isTextarea, placeholder: getPlaceholder(placeholder, errors, label) }) }), renderErrorText(error)] }));
+        return (jsx(InputWrapper, { value: value, onChange: onChange, inputRef: inputRef, isOpen: isOpen, onOpen: open, onClose: close, ...rest }));
     });
-    const normalizeInteger = (val = '') => val.replace(/[^\d]+/g, '');
-    const getPlaceholder = (placeholder, errors, label) => errors && !label ? `${placeholder}*` : placeholder;
 
     const AddressField = JSX(({ field, input }) => {
         const fieldName = input?.name || 'addressRegistration';
@@ -5198,9 +5192,7 @@
         return `w-16 sm:w-20 h-24 text-5xl text-center p-md m-2 border ${getValidStyle(!hasError || !isInputEmpty)} rounded-md caret-transparent outline-none`;
     };
 
-    const SubmitButton = JSX(({ isDisabled, onClick, text }) => {
-        return (jsx(Button, { type: "button", onClick: onClick, disabled: isDisabled, children: jsx(Text, { font: "font-normal", children: text }) }));
-    });
+    const SubmitButton = JSX(({ disabled = false, onClick, text }) => (jsx(Button, { type: "button", onClick: onClick, disabled: disabled, children: jsx(Text, { font: "font-normal", children: text }) })));
 
     const checkCode = async (body) => fetchRetailJSON('/sms/checkCode', 'POST', body).then(saveToken);
     const saveToken = (data) => {
@@ -5281,7 +5273,7 @@
         }, []);
         return (jsx(Dialog, { className: "my-6xl max-w-3xl w-full min-h-fit mx-auto rounded-xl p-m", onClose: onClose, children: jsxs("div", { className: "flex flex-col gap-xl items-center rounded-md", children: [jsx(Headline, { className: "w-full", title: "\u041F\u043E\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435 \u043D\u043E\u043C\u0435\u0440 \u0442\u0435\u043B\u0435\u0444\u043E\u043D\u0430", description: `Мы отправили код на ${phone}`, headlineVersion: "XS", isEmbedded: true, as: "h6" }), code ? (jsx(InputCode, { values: values, setValues: setValues, errorText: errorText, hasError: hasError })) : null, renderText$2(timeNextReq, handleSendCode), withDescription ? (jsxs(RichText, { itemSize: "list-s", children: [jsx("span", { children: "\u0412\u0432\u043E\u0434\u044F \u043A\u043E\u0434, \u044F \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0430\u044E, \u0447\u0442\u043E \u043E\u0437\u043D\u0430\u043A\u043E\u043C\u043B\u0435\u043D \u0438 \u043F\u043E\u0434\u043F\u0438\u0441\u044B\u0432\u0430\u044E: " }), jsx("ul", { children: consents?.map((_, i) => (jsx("li", { children: _ }, `${_}-${i}`))) })] })) : null, renderNextButton(isSubmitButtonDisabled, handleSubmit), isLoading ? jsx(Loader, { blur: false }) : null] }) }));
     });
-    const renderNextButton = (isDisabled, onClick) => (jsx(SubmitButton, { text: "\u0414\u0430\u043B\u0435\u0435", isDisabled: isDisabled, onClick: onClick }));
+    const renderNextButton = (disabled, onClick) => (jsx(SubmitButton, { text: "\u0414\u0430\u043B\u0435\u0435", disabled: disabled, onClick: onClick }));
     const renderText$2 = (timeNextReq, handleSendCode) => timeNextReq ? (jsxs("div", { className: "flex flex-row text-l font-light text-base", children: ["\u041F\u043E\u043B\u0443\u0447\u0438\u0442\u044C \u043D\u043E\u0432\u044B\u0439 \u043A\u043E\u0434 \u043C\u043E\u0436\u043D\u043E \u0447\u0435\u0440\u0435\u0437", jsx(Timer, { className: "ml-1", seconds: timeNextReq })] })) : (jsx(Button, { embedded: true, onClick: handleSendCode, children: jsx(ButtonTitle, { children: "\u041F\u043E\u043B\u0443\u0447\u0438\u0442\u044C \u043D\u043E\u0432\u044B\u0439 \u043A\u043E\u0434" }) }));
 
     const defaultConsentText = {
@@ -9260,13 +9252,13 @@
     ])(props)?.();
 
     function renderInput(props) {
-        const { placeholder, rates, selected, value, setValue, setSelected } = props;
+        const { placeholder, rates, selected, value, onChange, setSelected } = props;
         const ratesOptions = rates.map((_) => ({
             key: _?.currency?.currency ?? '',
             text: _?.currency?.currency ?? '',
         }));
         const selectedValue = { key: selected, text: selected };
-        return (jsxs("div", { className: "relative flex", children: [jsx(Input, { className: "shrink-0 text-l w-full appearance-none -mr-20", placeholder: placeholder, type: "text", value: value, onChange: setValue }), ratesOptions.length ? (jsx(Select, { className: "absolute right-0", isBorder: false, onChange: (_) => setSelected(_.key), options: ratesOptions, value: selectedValue })) : null] }));
+        return (jsxs("div", { className: "relative flex", children: [jsx(Input, { className: "shrink-0 text-l w-full appearance-none -mr-20", placeholder: placeholder, type: "text", value: value, onChange: onChange }), ratesOptions.length ? (jsx(Select, { className: "absolute right-0", isBorder: false, onChange: (_) => setSelected(_.key), options: ratesOptions, value: selectedValue })) : null] }));
     }
 
     const ExchangeCurrencyCalculator = JSX(({ className = '', currencyRatesBuy, currencyRatesSell, button }) => {
@@ -9283,14 +9275,14 @@
                             selected: calcState.selectSell,
                             setSelected: handleSelectSell(calcState, handleSetCalcState, currencyRatesSell),
                             value: calcState.inputSell,
-                            setValue: (value) => handleInputSell(handleSetCalcState, currencyRatesSell)(value, calcState.selectSell, calcState.selectBuy),
+                            onChange: (value) => handleInputSell(handleSetCalcState, currencyRatesSell)(value, calcState.selectSell, calcState.selectBuy),
                         }), renderInput({
                             placeholder: 'Получу',
                             rates: currencyRatesBuy,
                             selected: calcState.selectBuy,
                             setSelected: handleSelectBuy(calcState, handleSetCalcState, currencyRatesBuy),
                             value: calcState.inputBuy,
-                            setValue: (value) => handleInputBuy(handleSetCalcState, currencyRatesBuy)(value, calcState.selectBuy, calcState.selectSell),
+                            onChange: (value) => handleInputBuy(handleSetCalcState, currencyRatesBuy)(value, calcState.selectBuy, calcState.selectSell),
                         })] })) : null, button?.text ? (jsx(LinkButton, { text: button.text, version: button?.version, ...button })) : null] }));
     });
     const handleSelectSell = (calcState, setCalcState, currencyRatesSell) => (value) => {
@@ -10786,7 +10778,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.837";
+    const packageVersion = "0.14.839";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;