@redneckz/wildless-cms-uni-blocks 0.14.59 → 0.14.61

package/bundle/bundle.umd.js

@@ -3499,6 +3499,48 @@
     };
     const ErrorBlock = JSX(({ className = '', title, description, error, button, ...rest }) => (jsxs(BlockWrapper, { className: style('flex flex-col justify-center items-center', className), defaultPadding: style('p-6xl'), version: "transparent", ...rest, children: [jsx("div", { className: "flex justify-center", children: renderErrorContent(error) }), jsx(Headline, { title: title, description: description, headlineVersion: "XL", isEmbedded: true, className: "mb-2xl last:mb-0" }), button?.text ? jsx(Button, { version: button?.version, text: button?.text, ...button }) : null] })));
 
+    const useLatestEvent = (eventBus, type, initialEvent) => {
+        const [latestEvent, setLatestEvent] = useState(initialEvent || null);
+        useEffect(() => eventBus.subscribe(type, (_) => setLatestEvent(_)), [eventBus, type]);
+        const fireEvent = useCallback((_) => eventBus.fire(type, _), [eventBus, type]);
+        return [latestEvent, fireEvent];
+    };
+
+    const REGION_URL = '/api/v1/region';
+    const LOCATION_STORAGE_KEY = 'location';
+    function useLocation(defaultLocation = 'Москва') {
+        const [currentLocation, fireCurrentLocation] = useLatestEvent(defaultEventBus, 'location', restoreLocation() ?? { name: defaultLocation });
+        const selectCurrentLocation = useCallback((_) => {
+            storeLocation(_);
+            fireCurrentLocation(_);
+        }, []);
+        const { data } = useAsyncData(REGION_URL, fetchJSONUnsafe);
+        useEffect(() => {
+            if (data && !hasStoredLocation()) {
+                fireCurrentLocation(data);
+            }
+        }, [data]);
+        return [currentLocation ?? { name: defaultLocation }, selectCurrentLocation];
+    }
+    const hasStoredLocation = () => Boolean(globalThis.localStorage?.getItem(LOCATION_STORAGE_KEY));
+    const restoreLocation = () => {
+        try {
+            const data = globalThis.localStorage?.getItem(LOCATION_STORAGE_KEY);
+            return data && JSON.parse(data);
+        }
+        catch (ex) {
+            return null;
+        }
+    };
+    const storeLocation = (_) => {
+        try {
+            globalThis.localStorage?.setItem(LOCATION_STORAGE_KEY, JSON.stringify(_));
+        }
+        catch (ex) {
+            // Do nothing
+        }
+    };
+
     var Currency;
     (function (Currency) {
         Currency["RUB"] = "RUB";
@@ -3629,40 +3671,15 @@
     };
 
     const EXCHANGE_RATES_URL = '/api/v1/exchangerates';
-    const REGION_URL$1 = '/api/v1/region';
-    function useFetchExchangeRateData() {
-        const { data } = useAsyncData(EXCHANGE_RATES_URL, fetchData);
+    function useFetchExchangeRateData(currentRegion) {
+        const regionCode = currentRegion?.code || '000';
+        const { data } = useAsyncData(EXCHANGE_RATES_URL + `?regionCode=${regionCode}`, fetchJSONUnsafe);
         return data || {};
     }
-    const fetchData = async (urlExchangeRates) => {
-        const region = await fetchRegion();
-        const regionCode = region?.code || '000';
-        const exchangeRates = await fetchExchangeRates(urlExchangeRates, regionCode);
-        return { region, exchangeRates };
-    };
-    const fetchRegion = async () => {
-        try {
-            return await fetchJSONUnsafe(REGION_URL$1, { method: 'GET' });
-        }
-        catch (error) {
-            console.log(error);
-            return {};
-        }
-    };
-    const fetchExchangeRates = async (url, regionCode) => {
-        try {
-            return await fetchJSONUnsafe(url + `?regionCode=${regionCode}`, {
-                method: 'GET',
-            });
-        }
-        catch (error) {
-            console.log(error);
-            return {};
-        }
-    };
 
     const ExchangeRateTile = JSX(({ className = '', title = 'Курсы обмена валют', button, ...rest }) => {
-        const { exchangeRates } = useFetchExchangeRateData();
+        const [currentLocation] = useLocation();
+        const exchangeRates = useFetchExchangeRateData(currentLocation);
         const currencyRates = getCurrencyRates(exchangeRates?.exchangeRate?.currencies);
         const currencyRatesBuy = currencyRates.filter((_) => _.buyExchangeRate);
         currencyRatesBuy.unshift({ currency: { currency: Currency.RUB } });
@@ -4017,48 +4034,6 @@
         ? 'text-primary-main'
         : style(flat ? 'text-primary-text' : 'text-secondary-text', 'hover:text-primary-main'), 'group-data-transparent:text-white group-data-transparent:hover:text-primary-hover');
 
-    const useLatestEvent = (eventBus, type, initialEvent) => {
-        const [latestEvent, setLatestEvent] = useState(initialEvent || null);
-        useEffect(() => eventBus.subscribe(type, (_) => setLatestEvent(_)), [eventBus, type]);
-        const fireEvent = useCallback((_) => eventBus.fire(type, _), [eventBus, type]);
-        return [latestEvent, fireEvent];
-    };
-
-    const REGION_URL = '/api/v1/region';
-    const LOCATION_STORAGE_KEY = 'location';
-    function useLocation(defaultLocation = 'Москва') {
-        const [currentLocation, fireCurrentLocation] = useLatestEvent(defaultEventBus, 'location', restoreLocation() ?? { name: defaultLocation });
-        const selectCurrentLocation = useCallback((_) => {
-            storeLocation(_);
-            fireCurrentLocation(_);
-        }, []);
-        const { data } = useAsyncData(REGION_URL, fetchJSONUnsafe);
-        useEffect(() => {
-            if (data && !hasStoredLocation()) {
-                fireCurrentLocation(data);
-            }
-        }, [data]);
-        return [currentLocation ?? { name: defaultLocation }, selectCurrentLocation];
-    }
-    const hasStoredLocation = () => Boolean(globalThis.localStorage?.getItem(LOCATION_STORAGE_KEY));
-    const restoreLocation = () => {
-        try {
-            const data = globalThis.localStorage?.getItem(LOCATION_STORAGE_KEY);
-            return data && JSON.parse(data);
-        }
-        catch (ex) {
-            return null;
-        }
-    };
-    const storeLocation = (_) => {
-        try {
-            globalThis.localStorage?.setItem(LOCATION_STORAGE_KEY, JSON.stringify(_));
-        }
-        catch (ex) {
-            // Do nothing
-        }
-    };
-
     const REGIONS_URL = '/api/v1/regions';
     function useRegions() {
         const { data } = useAsyncData(REGIONS_URL, fetchJSONUnsafe);
@@ -4341,7 +4316,7 @@
         return (jsxs("button", { type: "button", onClick: onClick, className: `p-3xl min-w-fit flex items-center gap-2xl bg-white border-solid border relative ${btnClassName}`, children: [slide?.icon ? (jsx(Img, { className: "p-lg rounded-full bg-secondary-light", image: slide.icon, width: "108", height: "108" })) : null, jsxs("div", { className: "flex gap-s", children: [slide?.sum ? renderValueBlock('страховая сумма', slide.sum) : null, slide?.fee ? renderValueBlock('страховой взнос', slide.fee) : null] }), renderDoneIcon(isActive)] }, String(i)));
     }
     function renderValueBlock(title, sum) {
-        return (jsxs("div", { className: "flex flex-col text-left whitespace-pre", children: [jsxs("span", { className: "text-h6", children: [toLocalNumberFormat(2)(sum), " \u20BD"] }), jsx("span", { className: "text-secondary-text text-l mt-2xs", children: title })] }));
+        return (jsxs("div", { className: "flex flex-col text-left whitespace-pre", children: [jsxs(Text, { size: "text-h6", children: [toLocalNumberFormat(2)(sum), " \u20BD"] }), jsx("div", { className: "mt-2xs", children: jsx(Text, { size: "text-l", color: "text-secondary-text", children: title }) })] }));
     }
     function renderDoneIcon(isActive) {
         return isActive ? (jsx(Img, { className: `h-6 w-6 min-w-6 min-h-6 absolute right-4 top-4`, image: { icon: 'DoneIcon' }, width: "24", height: "24" })) : null;
@@ -5825,7 +5800,7 @@
         return (jsx("div", { className: "flex items-end absolute bottom-0 right-0 h-full pointer-events-none", children: jsx(LikeControl, { className: "rounded-tl-3xl sticky bottom-0 pointer-events-auto" }) }));
     }
 
-    const packageVersion = "0.14.58";
+    const packageVersion = "0.14.60";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;