@redneckz/wildless-cms-uni-blocks 0.14.668 → 0.14.670

package/bundle/bundle.umd.js

@@ -1456,7 +1456,7 @@
     const snilsValidator = (errorMsg) => validator(snilsValidate)(errorMsg);
     const emailValidate = (email) => /^[^\s@]+@[^\s@]+\.[a-zA-Z]{2,4}$/.test(email);
     const emailValidator = (errorMsg) => validator((_) => emailValidate(_))(errorMsg);
-    const addressDaDataValidate = (address) => Boolean(address.qc === '0' && address.qcComplete === '0' && address.qcHouse === '2');
+    const addressDaDataValidate = (address) => Boolean(address.region && address.city && address.house);
     const addressDaDataValidator = () => validator(addressDaDataValidate)('Укажите регион, город/населенный пункт, улицу, дом, квартиру');
     const addressOrganizationValidator = () => validator((address) => Boolean(address.fiasCode && address.city && address.house))('Укажите регион, город/населенный пункт, улицу, дом');
     const codeWordValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length >= 3 && _.length <= 21 && /^[\u0400-\u04FF\d]+$/u.test(_))(errorMsg ?? ERROR_MESSAGE);
@@ -1975,12 +1975,13 @@
     //       Сейчас реализован поиск среди тестовых данных
     // TODO: Также выяснить что делать когда ничего не найдено
     // TODO: На макетах также когда есть поле поиска нет кнопки открыть на карте.
-    const YandexMap = JSX(({ points, className = '', zoom = 5, isLoad, selectedAddress }) => {
+    const YandexMap = JSX(({ points, className = '', zoom = 5, isLoad }) => {
         const map = useRef(null);
+        const parentDiv = useRef(null);
         const yandexMaps = useYandexMaps();
         useEffect(() => {
             if (map.current) {
-                renderClusterer({ yandexMaps, map: map.current, points, isLoad, selectedAddress });
+                renderClusterer({ yandexMaps, map: map.current, points, isLoad });
             }
             else {
                 yandexMaps?.ready(() => {
@@ -1989,7 +1990,7 @@
                         renderClusterer({ yandexMaps, map: map.current, points, isLoad });
                         return;
                     }
-                    map.current = new yandexMaps.Map('map', {
+                    map.current = new yandexMaps.Map(parentDiv.current, {
                         center: getCenterPoint(points),
                         zoom,
                         controls: [],
@@ -1998,22 +1999,12 @@
                     renderClusterer({ yandexMaps, map: map.current, points, isLoad });
                 });
             }
-        }, [yandexMaps, points, zoom, isLoad, selectedAddress]);
-        useEffect(() => {
-            if (map.current && selectedAddress) {
-                yandexMaps?.geocode(selectedAddress).then((res) => {
-                    const firstGeoObject = res.geoObjects.get(0);
-                    const coords = firstGeoObject.geometry.getCoordinates();
-                    map.current.setCenter(coords);
-                    map.current.setZoom(18);
-                });
-            }
-        }, [selectedAddress]);
+        }, [yandexMaps, points, zoom, isLoad]);
         if (!yandexMaps) {
             return null;
         }
         const zIndex = 'z-10';
-        return (jsxs("div", { id: "map", className: style('relative', 'w-full', className), children: [isLoad ? jsx(Loader, {}) : null, jsxs("div", { className: style('absolute right-2 top-52 z-10 w-12 overflow-hidden border border-transparent rounded-md', zIndex), children: [jsx(ZoomButton, { yandexMaps: map }), jsx(ZoomButton, { yandexMaps: map, direction: "out" })] }), renderUserGeolocation(map, yandexMaps, style('right-2 top-80', zIndex))] }));
+        return (jsxs("div", { ref: parentDiv, className: style('relative', 'w-full', className), children: [isLoad ? jsx(Loader, {}) : null, jsxs("div", { className: style('absolute right-2 top-52 z-10 w-12 overflow-hidden border border-transparent rounded-md', zIndex), children: [jsx(ZoomButton, { yandexMaps: map }), jsx(ZoomButton, { yandexMaps: map, direction: "out" })] }), renderUserGeolocation(map, yandexMaps, style('right-2 top-80', zIndex))] }));
     });
     const getCenterPoint = (points) => {
         const centerCoords = [
@@ -2476,7 +2467,8 @@
         const [offices, setOffices] = useState([]);
         const { data } = useLeadFormData('REGION_RF');
         const regionValue = field('regionRetail')?.value || {};
-        const fieldBranch = field('addressRetail');
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        field('addressRetail');
         useEffect(() => {
             (async () => {
                 const officesList = await regionOffices(regionValue?.key ?? '');
@@ -2496,7 +2488,7 @@
         return (jsxs("div", { children: [jsx(SelectControl, { label: "\u0410\u0434\u0440\u0435\u0441 \u043E\u0442\u0434\u0435\u043B\u0435\u043D\u0438\u044F", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043E\u0442\u0434\u0435\u043B\u0435\u043D\u0438\u0435", options: offices.map(({ id, address = '' }) => ({
                         key: id?.toString() || '',
                         text: address,
-                    })), ...getValidation(field('addressRetail'), validatorObj.addressRetail, input?.required && isRegionSelected), isSearch: true }), jsx("div", { className: "h-[600px]", children: jsx(ClientOnly, { children: jsx(YandexMap, { points: points, isLoad: !data, className: "h-full", selectedAddress: fieldBranch?.value?.text }) }) })] }));
+                    })), ...getValidation(field('addressRetail'), validatorObj.addressRetail, input?.required && isRegionSelected), isSearch: true }), jsx("div", { className: "h-[600px]", children: jsx(ClientOnly, { children: jsx(YandexMap, { points: points, isLoad: !data, className: "h-full" }) }) })] }));
     });
 
     const useNormalizedInput = (props, { normalize, format }) => {
@@ -6917,17 +6909,21 @@
     ];
     const CreditCardForm = JSX(({ className, ...rest }) => {
         const [step, setStep] = useState(0);
+        const formContainerRef = useRef(null);
+        const scrollToTop = useCallback(() => formContainerRef?.current?.scrollIntoView({ behavior: 'smooth' }), [formContainerRef]);
         useEffect(updateRefreshToken, []);
         const handleNextStep = useCallback(() => {
             setStep((_) => Math.min(_ + 1, WIZARD_STEPS$1));
+            scrollToTop();
         }, []);
         const handlePrevStep = useCallback(() => {
             //TODO search hook - 1,
             setStep((_) => Math.max(_ - 1, 0));
+            scrollToTop();
         }, []);
         const sections = useMemo(() => stepsSectionsMap$1[step], [step]);
         const [isFormFinished, setIsFormFinished] = useState(false);
-        return (jsx(BlockWrapper, { className: style('bg-transparent', className), defaultPadding: "p-0", ...rest, children: jsxs("div", { className: "container grid grid-cols-12", children: [isFormFinished ? null : (jsx(CreditCardFormProgress, { stepsTitles: WIZARD_TITLES$1, step: step, totalSteps: WIZARD_STEPS$1 })), jsx("div", { className: "py-lg px-5xl mt-2xs bg-white col-span-12", children: jsx(CreditCardFormStep, { step: step, sections: sections, onNextStep: handleNextStep, onPrevStep: handlePrevStep, isFormFinished: isFormFinished, finishForm: setIsFormFinished }, String(step)) })] }) }));
+        return (jsx(BlockWrapper, { className: style('bg-transparent', className), defaultPadding: "p-0", ...rest, children: jsxs("div", { ref: formContainerRef, className: "container grid grid-cols-12", children: [isFormFinished ? null : (jsx(CreditCardFormProgress, { stepsTitles: WIZARD_TITLES$1, step: step, totalSteps: WIZARD_STEPS$1 })), jsx("div", { className: "py-lg px-5xl mt-2xs bg-white col-span-12", children: jsx(CreditCardFormStep, { step: step, sections: sections, onNextStep: handleNextStep, onPrevStep: handlePrevStep, isFormFinished: isFormFinished, finishForm: setIsFormFinished }, String(step)) })] }) }));
     });
 
     const CreditFormProgress = JSX(({ step = 1, totalSteps = 5, stepsTitles = [] }) => {
@@ -7698,18 +7694,22 @@
     ];
     const CreditForm = JSX(({ className, ...rest }) => {
         const [step, setStep] = useState(0);
+        const formContainerRef = useRef(null);
+        const scrollToTop = useCallback(() => formContainerRef?.current?.scrollIntoView({ behavior: 'smooth' }), [formContainerRef]);
         useEffect(updateRefreshToken, []);
         const handleNextStep = useCallback(() => {
             setStep((_) => Math.min(_ + 1, WIZARD_STEPS));
+            scrollToTop();
         }, []);
         const handlePrevStep = useCallback(() => {
             //TODO search hook - 1,
             setStep((_) => Math.max(_ - 1, 0));
+            scrollToTop();
         }, []);
         const sections = useMemo(() => stepsSectionsMap[step], [step]);
         const isStartStep = step === 0;
         const [isFormFinished, setIsFormFinished] = useState(false);
-        return (jsx(BlockWrapper, { className: style('bg-transparent', className), defaultPadding: "p-0", ...rest, children: jsxs("div", { className: "container grid grid-cols-12", children: [isStartStep || isFormFinished ? null : (jsx(CreditFormProgress, { stepsTitles: WIZARD_TITLES, step: step, totalSteps: WIZARD_STEPS })), jsx("div", { className: "py-lg px-5xl mt-2xs bg-white col-span-12", children: jsx(CreditFormStep, { step: step, sections: sections, onNextStep: handleNextStep, onPrevStep: handlePrevStep, isFormFinished: isFormFinished, finishForm: setIsFormFinished, renderStep: isStartStep
+        return (jsx(BlockWrapper, { className: style('bg-transparent', className), defaultPadding: "p-0", ...rest, children: jsxs("div", { ref: formContainerRef, className: "container grid grid-cols-12", children: [isStartStep || isFormFinished ? null : (jsx(CreditFormProgress, { stepsTitles: WIZARD_TITLES, step: step, totalSteps: WIZARD_STEPS })), jsx("div", { className: "py-lg px-5xl mt-2xs bg-white col-span-12", children: jsx(CreditFormStep, { step: step, sections: sections, onNextStep: handleNextStep, onPrevStep: handlePrevStep, isFormFinished: isFormFinished, finishForm: setIsFormFinished, renderStep: isStartStep
                                 ? ({ registerSubmit, field }) => (jsx(CalculatorCredit, { ...{
                                         defaultParams: {
                                             sum: field('moneyValue').value,
@@ -9985,7 +9985,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.667";
+    const packageVersion = "0.14.669";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;