@redneckz/wildless-cms-uni-blocks 0.14.865 → 0.14.866

package/bundle/bundle.umd.js

@@ -5034,6 +5034,12 @@
 
     const updateUserTask = (body) => doRequest('/user-data/updateUserTask', 'PUT', body);
 
+    const sessionStore = new Store(); // sessionStorage cache
+    replicate(sessionStore, new StorageAdapter(globalThis?.sessionStorage));
+    function useSessionStore() {
+        return useStore(sessionStore);
+    }
+
     const Timer = JSX(({ className, seconds }) => (jsx("span", { className: className, children: formatTimer(seconds) })));
     const formatTimer = (seconds) => {
         const minutes = Math.floor(seconds / 60);
@@ -5192,25 +5198,29 @@
     };
 
     const useVerifyPhoneDialogSubmit = ({ values, onSuccess, }) => {
+        const sessionStore = useSessionStore();
+        const attempts = sessionStore.smsCode?.attempts || 0;
+        const timer = Math.max(getTimer(sessionStore.smsCode?.sendTime || Date.now()), 0);
         const [errorText, setErrorText] = useState('');
         const [isLoading, { setTrue: startLoading, setFalse: endLoading }] = useBool(false);
-        const [timeNextReq, setTimeNextReq] = useState(0);
-        const [isTimerStarted, setIsTimerStarted] = useState(false);
-        const [attempts, setAttempts] = useState(0);
+        const [timeNextReq, setTimeNextReq] = useState(timer);
         const resetError = useCallback(() => setErrorText(''), []);
-        const isTimeExpired = Boolean(timeNextReq === 0 && isTimerStarted);
+        const isTimeExpired = Boolean(timeNextReq === 0 && sessionStore.smsCode?.sendTime);
         const isSubmitButtonDisabled = attempts > 2 || isTimeExpired || !values.every(Boolean);
         const handleSubmit = useCallback(async () => {
             try {
-                setIsTimerStarted(false);
-                setTimeNextReq(0);
-                setAttempts((_) => _ + 1);
+                sessionStore.smsCode = {
+                    ...sessionStore.smsCode,
+                    attempts: attempts + 1,
+                };
                 startLoading();
                 await checkCode({
                     smsText: values.join(''),
                     smsCodesSetName: { key: 'AUTHENTICATION' },
                 });
+                setTimeNextReq(0);
                 resetError();
+                sessionStore.smsCode = null;
                 await onSuccess?.(values.join(''));
             }
             catch {
@@ -5221,7 +5231,12 @@
             }
         }, [values, attempts]);
         useEffect(() => {
-            setErrorText(isTimeExpired ? 'Код просрочен' : '');
+            if (isTimeExpired) {
+                setErrorText('Код просрочен');
+            }
+            else if (attempts > 2) {
+                setErrorText('Исчерпан лимит ввода смс-кода');
+            }
         }, [isTimeExpired]);
         return {
             handleSubmit,
@@ -5231,14 +5246,17 @@
             timeNextReq,
             isSubmitButtonDisabled,
             setTimeNextReq,
-            setIsTimerStarted,
-            setAttempts,
+            setErrorText,
         };
     };
+    const getTimer = (sendTime) => TIME_TO_RESEND - Math.floor((Date.now() - sendTime) / 1000);
 
-    const VerifyPhoneDialog = JSX(({ phone, code = true, withDescription = true, codeLength = 4, consents, onSuccess = noop, onClose = noop, }) => {
-        const [values, setValues] = useState(Array(codeLength).fill(''));
-        const { handleSubmit, hasError, errorText, isLoading, timeNextReq, isSubmitButtonDisabled, setTimeNextReq, setIsTimerStarted, setAttempts, } = useVerifyPhoneDialogSubmit({ values, onSuccess });
+    const TIME_TO_RESEND = 180;
+    const CODE_LENGTH = 4;
+    const VerifyPhoneDialog = JSX(({ phone, withDescription = true, consents, onSuccess = noop, onClose = noop }) => {
+        const [values, setValues] = useState(Array(CODE_LENGTH).fill(''));
+        const sessionStore = useSessionStore();
+        const { handleSubmit, hasError, errorText, isLoading, timeNextReq, isSubmitButtonDisabled, setTimeNextReq, setErrorText, } = useVerifyPhoneDialogSubmit({ values, onSuccess });
         const captchaDialog = useDialog(CaptchaDialog);
         const phoneNumber = formatPhone(phone);
         const restartTimer = useCountDownTimer({ seconds: timeNextReq, onTick: setTimeNextReq });
@@ -5248,19 +5266,24 @@
                 smsCodesSetName: { key: 'AUTHENTICATION' },
             });
             if (isSuccessSendCode) {
-                setAttempts(0);
-                setTimeNextReq(180);
-                restartTimer(180);
-                setIsTimerStarted(true);
+                setTimeNextReq(TIME_TO_RESEND);
+                restartTimer(TIME_TO_RESEND);
+                setErrorText('');
+                sessionStore.smsCode = {
+                    sendTime: Date.now(),
+                    attempts: 0,
+                };
             }
             else {
                 captchaDialog.open({ phoneNumber, sendCode: handleSendCode });
             }
         }, [phoneNumber, restartTimer, onClose]);
         useEffect(() => {
-            handleSendCode();
+            if (!sessionStore.smsCode?.sendTime) {
+                handleSendCode();
+            }
         }, []);
-        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$1(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] }) }));
+        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" }), jsx(InputCode, { values: values, setValues: setValues, errorText: errorText, hasError: hasError }), renderText$1(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 = (disabled, onClick) => (jsx(SubmitButton, { text: "\u0414\u0430\u043B\u0435\u0435", disabled: disabled, onClick: onClick }));
     const renderText$1 = (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: "pl-2xs", 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" }) }));
@@ -7347,12 +7370,6 @@
 
     const CurrencyInput = JSX((props) => (jsx(NumberInput, { ...props, fractionDigits: 2, children: jsx("div", { className: "absolute right-4 bottom-4", children: jsx(Text, { size: "text-xl", font: "font-light", children: "\u20BD" }) }) })));
 
-    const sessionStore = new Store(); // sessionStorage cache
-    replicate(sessionStore, new StorageAdapter(globalThis?.sessionStorage));
-    function useSessionStore() {
-        return useStore(sessionStore);
-    }
-
     const paymentURLMap = {
         private: 'p2p/registerP2P',
         business: 'b2c/registerB2C',
@@ -10996,7 +11013,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.864";
+    const packageVersion = "0.14.865";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;