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

package/bundle/components/ExchangeRateTile/useFetchExchangeRateData.d.ts

@@ -1,17 +1,9 @@
 import { type ExchangeCurrencyItem } from '../../components/ExchangeRateTile/ExchangeCurrencyCalculator';
+import { type RegionData } from '../../hooks/useLocation';
 export interface ExchangeData {
     exchangeRate?: {
         currencies?: ExchangeCurrencyItem[];
     };
     address?: string;
 }
-export interface RegionData {
-    id?: number;
-    code?: string;
-    name?: string;
-}
-export declare function useFetchExchangeRateData(): {
-    region?: RegionData | undefined;
-    exchangeRates?: ExchangeData | undefined;
-};
-export declare function useCurrentPosition(): RegionData;
+export declare function useFetchExchangeRateData(currentRegion: RegionData): ExchangeData;

package/dist/components/ExchangeRateTile/ExchangeRateTile.js

@@ -2,6 +2,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExchangeRateTile = void 0;
 const jsx_runtime_1 = require("@redneckz/uni-jsx/jsx-runtime");
 const uni_jsx_1 = require("@redneckz/uni-jsx");
+const useLocation_1 = require("../../hooks/useLocation");
 const BaseTile_1 = require("../../ui-kit/BaseTile/BaseTile");
 const BlockWrapper_1 = require("../../ui-kit/BlockWrapper");
 const Heading_1 = require("../../ui-kit/Heading/Heading");
@@ -12,7 +13,8 @@ const CurrentLocation_1 = require("./CurrentLocation");
 const ExchangeCurrencyCalculator_1 = require("./ExchangeCurrencyCalculator");
 const useFetchExchangeRateData_1 = require("./useFetchExchangeRateData");
 exports.ExchangeRateTile = (0, uni_jsx_1.JSX)(({ className = '', title = 'Курсы обмена валют', button, ...rest }) => {
-    const { exchangeRates } = (0, useFetchExchangeRateData_1.useFetchExchangeRateData)();
+    const [currentLocation] = (0, useLocation_1.useLocation)();
+    const exchangeRates = (0, useFetchExchangeRateData_1.useFetchExchangeRateData)(currentLocation);
     const currencyRates = getCurrencyRates(exchangeRates?.exchangeRate?.currencies);
     const currencyRatesBuy = currencyRates.filter((_) => _.buyExchangeRate);
     currencyRatesBuy.unshift({ currency: { currency: CurrencyProps_1.Currency.RUB } });

package/dist/components/ExchangeRateTile/ExchangeRateTile.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExchangeRateTile.js","sourceRoot":"","sources":["../../../src/components/ExchangeRateTile/ExchangeRateTile.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AAExC,6DAA0D;AAC1D,4DAAyD;AACzD,0DAAuD;AACvD,6CAA0C;AAC1C,mDAA2C;AAC3C,mDAAgD;AAChD,uDAAoD;AACpD,6EAGsC;AAEtC,yEAAsE;AAIzD,QAAA,gBAAgB,GAAG,IAAA,aAAG,EACjC,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,KAAK,GAAG,oBAAoB,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IACpE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAA,mDAAwB,GAAE,CAAC;IAErD,MAAM,aAAa,GAAG,gBAAgB,CAAC,aAAa,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IAEhF,MAAM,gBAAgB,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;IACxE,gBAAgB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,wBAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAEnE,MAAM,iBAAiB,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;IAC1E,iBAAiB,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,wBAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAEjE,OAAO,CACL,uBAAC,2BAAY,IAAC,SAAS,EAAE,IAAA,aAAK,EAAC,qBAAqB,EAAE,SAAS,CAAC,KAAM,IAAI,YACxE,uBAAC,mBAAQ,IACP,SAAS,EAAC,QAAQ,EAClB,KAAK,EAAE,uBAAC,iBAAO,IAAC,WAAW,EAAC,IAAI,EAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAC,qBAAqB,GAAG,YAEjF,iCAAK,SAAS,EAAC,wBAAwB,aACrC,4CACG,aAAa,CAAC,CAAC,CAAC,CACf,uBAAC,6BAAa,IAAC,SAAS,EAAC,OAAO,EAAC,qBAAqB,EAAE,aAAa,GAAI,CAC1E,CAAC,CAAC,CAAC,IAAI,EACR,uBAAC,iCAAe,IAAC,OAAO,EAAE,aAAa,EAAE,OAAO,GAAI,IAChD,EACL,aAAa,CAAC,MAAM,IAAI,gBAAgB,CAAC,MAAM,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,CAC7E,uBAAC,uDAA0B,IACzB,SAAS,EAAC,MAAM,EAChB,gBAAgB,EAAE,gBAAgB,EAClC,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM,GACd,CACH,CAAC,CAAC,CAAC,IAAI,IACJ,GACG,GACE,CAChB,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,UAAmC,EAAE,EAAE;IAC/D,OAAO,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;AACzF,CAAC,CAAC"}
+{"version":3,"file":"ExchangeRateTile.js","sourceRoot":"","sources":["../../../src/components/ExchangeRateTile/ExchangeRateTile.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,yDAAsD;AAEtD,6DAA0D;AAC1D,4DAAyD;AACzD,0DAAuD;AACvD,6CAA0C;AAC1C,mDAA2C;AAC3C,mDAAgD;AAChD,uDAAoD;AACpD,6EAGsC;AAEtC,yEAAsE;AAIzD,QAAA,gBAAgB,GAAG,IAAA,aAAG,EACjC,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,KAAK,GAAG,oBAAoB,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IACpE,MAAM,CAAC,eAAe,CAAC,GAAG,IAAA,yBAAW,GAAE,CAAC;IACxC,MAAM,aAAa,GAAG,IAAA,mDAAwB,EAAC,eAAe,CAAC,CAAC;IAEhE,MAAM,aAAa,GAAG,gBAAgB,CAAC,aAAa,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IAEhF,MAAM,gBAAgB,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;IACxE,gBAAgB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,wBAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAEnE,MAAM,iBAAiB,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;IAC1E,iBAAiB,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,wBAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAEjE,OAAO,CACL,uBAAC,2BAAY,IAAC,SAAS,EAAE,IAAA,aAAK,EAAC,qBAAqB,EAAE,SAAS,CAAC,KAAM,IAAI,YACxE,uBAAC,mBAAQ,IACP,SAAS,EAAC,QAAQ,EAClB,KAAK,EAAE,uBAAC,iBAAO,IAAC,WAAW,EAAC,IAAI,EAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAC,qBAAqB,GAAG,YAEjF,iCAAK,SAAS,EAAC,wBAAwB,aACrC,4CACG,aAAa,CAAC,CAAC,CAAC,CACf,uBAAC,6BAAa,IAAC,SAAS,EAAC,OAAO,EAAC,qBAAqB,EAAE,aAAa,GAAI,CAC1E,CAAC,CAAC,CAAC,IAAI,EACR,uBAAC,iCAAe,IAAC,OAAO,EAAE,aAAa,EAAE,OAAO,GAAI,IAChD,EACL,aAAa,CAAC,MAAM,IAAI,gBAAgB,CAAC,MAAM,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,CAC7E,uBAAC,uDAA0B,IACzB,SAAS,EAAC,MAAM,EAChB,gBAAgB,EAAE,gBAAgB,EAClC,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM,GACd,CACH,CAAC,CAAC,CAAC,IAAI,IACJ,GACG,GACE,CAChB,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,UAAmC,EAAE,EAAE;IAC/D,OAAO,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;AACzF,CAAC,CAAC"}

package/dist/components/ExchangeRateTile/useFetchExchangeRateData.d.ts

@@ -1,17 +1,9 @@
 import { type ExchangeCurrencyItem } from '../../components/ExchangeRateTile/ExchangeCurrencyCalculator';
+import { type RegionData } from '../../hooks/useLocation';
 export interface ExchangeData {
     exchangeRate?: {
         currencies?: ExchangeCurrencyItem[];
     };
     address?: string;
 }
-export interface RegionData {
-    id?: number;
-    code?: string;
-    name?: string;
-}
-export declare function useFetchExchangeRateData(): {
-    region?: RegionData | undefined;
-    exchangeRates?: ExchangeData | undefined;
-};
-export declare function useCurrentPosition(): RegionData;
+export declare function useFetchExchangeRateData(currentRegion: RegionData): ExchangeData;

package/dist/components/ExchangeRateTile/useFetchExchangeRateData.js

@@ -1,43 +1,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useCurrentPosition = exports.useFetchExchangeRateData = void 0;
+exports.useFetchExchangeRateData = void 0;
 const useAsyncData_1 = require("@redneckz/uni-jsx/lib/hooks/useAsyncData");
 const fetchJSON_1 = require("../../utils/fetchJSON");
 const EXCHANGE_RATES_URL = '/api/v1/exchangerates';
-const REGION_URL = '/api/v1/region';
-function useFetchExchangeRateData() {
-    const { data } = (0, useAsyncData_1.useAsyncData)(EXCHANGE_RATES_URL, fetchData);
+function useFetchExchangeRateData(currentRegion) {
+    const regionCode = currentRegion?.code || '000';
+    const { data } = (0, useAsyncData_1.useAsyncData)(EXCHANGE_RATES_URL + `?regionCode=${regionCode}`, fetchJSON_1.fetchJSONUnsafe);
     return data || {};
 }
 exports.useFetchExchangeRateData = useFetchExchangeRateData;
-function useCurrentPosition() {
-    const { data } = (0, useAsyncData_1.useAsyncData)(REGION_URL, fetchJSON_1.fetchJSONUnsafe);
-    return data || {};
-}
-exports.useCurrentPosition = useCurrentPosition;
-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 (0, fetchJSON_1.fetchJSONUnsafe)(REGION_URL, { method: 'GET' });
-    }
-    catch (error) {
-        console.log(error);
-        return {};
-    }
-};
-const fetchExchangeRates = async (url, regionCode) => {
-    try {
-        return await (0, fetchJSON_1.fetchJSONUnsafe)(url + `?regionCode=${regionCode}`, {
-            method: 'GET',
-        });
-    }
-    catch (error) {
-        console.log(error);
-        return {};
-    }
-};
 //# sourceMappingURL=useFetchExchangeRateData.js.map

package/dist/components/ExchangeRateTile/useFetchExchangeRateData.js.map

@@ -1 +1 @@
-{"version":3,"file":"useFetchExchangeRateData.js","sourceRoot":"","sources":["../../../src/components/ExchangeRateTile/useFetchExchangeRateData.ts"],"names":[],"mappings":";;AAAA,2EAAwE;AAExE,qDAAwD;AAexD,MAAM,kBAAkB,GAAG,uBAAuB,CAAC;AACnD,MAAM,UAAU,GAAG,gBAAgB,CAAC;AAEpC,SAAgB,wBAAwB;IACtC,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,2BAAY,EAG1B,kBAAkB,EAAE,SAAS,CAAC,CAAC;IAElC,OAAO,IAAI,IAAI,EAAE,CAAC;AACpB,CAAC;AAPD,4DAOC;AAED,SAAgB,kBAAkB;IAChC,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,2BAAY,EAAa,UAAU,EAAE,2BAAe,CAAC,CAAC;IAEvE,OAAO,IAAI,IAAI,EAAE,CAAC;AACpB,CAAC;AAJD,gDAIC;AAED,MAAM,SAAS,GAAG,KAAK,EACrB,gBAAwB,EAIvB,EAAE;IACH,MAAM,MAAM,GAAG,MAAM,WAAW,EAAE,CAAC;IAEnC,MAAM,UAAU,GAAG,MAAM,EAAE,IAAI,IAAI,KAAK,CAAC;IAEzC,MAAM,aAAa,GAAG,MAAM,kBAAkB,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;IAE7E,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;AACnC,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,KAAK,IAAyB,EAAE;IAClD,IAAI;QACF,OAAO,MAAM,IAAA,2BAAe,EAAa,UAAU,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;KACzE;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAEnB,OAAO,EAAE,CAAC;KACX;AACH,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,KAAK,EAAE,GAAW,EAAE,UAAkB,EAAyB,EAAE;IAC1F,IAAI;QACF,OAAO,MAAM,IAAA,2BAAe,EAAe,GAAG,GAAG,eAAe,UAAU,EAAE,EAAE;YAC5E,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;KACJ;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAEnB,OAAO,EAAE,CAAC;KACX;AACH,CAAC,CAAC"}
+{"version":3,"file":"useFetchExchangeRateData.js","sourceRoot":"","sources":["../../../src/components/ExchangeRateTile/useFetchExchangeRateData.ts"],"names":[],"mappings":";;AAAA,2EAAwE;AAGxE,qDAAwD;AASxD,MAAM,kBAAkB,GAAG,uBAAuB,CAAC;AAEnD,SAAgB,wBAAwB,CAAC,aAAyB;IAChE,MAAM,UAAU,GAAG,aAAa,EAAE,IAAI,IAAI,KAAK,CAAC;IAEhD,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,2BAAY,EAC3B,kBAAkB,GAAG,eAAe,UAAU,EAAE,EAChD,2BAAe,CAChB,CAAC;IAEF,OAAO,IAAI,IAAI,EAAE,CAAC;AACpB,CAAC;AATD,4DASC"}

package/lib/components/ExchangeRateTile/ExchangeRateTile.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
+import { useLocation } from '../../hooks/useLocation.js';
 import { BaseTile } from '../../ui-kit/BaseTile/BaseTile.js';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper.js';
 import { Heading } from '../../ui-kit/Heading/Heading.js';
@@ -10,7 +11,8 @@ import { CurrentLocation } from './CurrentLocation.js';
 import { ExchangeCurrencyCalculator, } from './ExchangeCurrencyCalculator.js';
 import { useFetchExchangeRateData } from './useFetchExchangeRateData.js';
 export 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 } });

package/lib/components/ExchangeRateTile/ExchangeRateTile.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExchangeRateTile.js","sourceRoot":"","sources":["../../../src/components/ExchangeRateTile/ExchangeRateTile.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACL,0BAA0B,GAE3B,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAItE,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,CACjC,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,KAAK,GAAG,oBAAoB,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IACpE,MAAM,EAAE,aAAa,EAAE,GAAG,wBAAwB,EAAE,CAAC;IAErD,MAAM,aAAa,GAAG,gBAAgB,CAAC,aAAa,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IAEhF,MAAM,gBAAgB,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;IACxE,gBAAgB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAEnE,MAAM,iBAAiB,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;IAC1E,iBAAiB,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAEjE,OAAO,CACL,KAAC,YAAY,IAAC,SAAS,EAAE,KAAK,CAAC,qBAAqB,EAAE,SAAS,CAAC,KAAM,IAAI,YACxE,KAAC,QAAQ,IACP,SAAS,EAAC,QAAQ,EAClB,KAAK,EAAE,KAAC,OAAO,IAAC,WAAW,EAAC,IAAI,EAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAC,qBAAqB,GAAG,YAEjF,eAAK,SAAS,EAAC,wBAAwB,aACrC,0BACG,aAAa,CAAC,CAAC,CAAC,CACf,KAAC,aAAa,IAAC,SAAS,EAAC,OAAO,EAAC,qBAAqB,EAAE,aAAa,GAAI,CAC1E,CAAC,CAAC,CAAC,IAAI,EACR,KAAC,eAAe,IAAC,OAAO,EAAE,aAAa,EAAE,OAAO,GAAI,IAChD,EACL,aAAa,CAAC,MAAM,IAAI,gBAAgB,CAAC,MAAM,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,CAC7E,KAAC,0BAA0B,IACzB,SAAS,EAAC,MAAM,EAChB,gBAAgB,EAAE,gBAAgB,EAClC,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM,GACd,CACH,CAAC,CAAC,CAAC,IAAI,IACJ,GACG,GACE,CAChB,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,UAAmC,EAAE,EAAE;IAC/D,OAAO,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;AACzF,CAAC,CAAC"}
+{"version":3,"file":"ExchangeRateTile.js","sourceRoot":"","sources":["../../../src/components/ExchangeRateTile/ExchangeRateTile.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACL,0BAA0B,GAE3B,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAItE,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,CACjC,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,KAAK,GAAG,oBAAoB,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IACpE,MAAM,CAAC,eAAe,CAAC,GAAG,WAAW,EAAE,CAAC;IACxC,MAAM,aAAa,GAAG,wBAAwB,CAAC,eAAe,CAAC,CAAC;IAEhE,MAAM,aAAa,GAAG,gBAAgB,CAAC,aAAa,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IAEhF,MAAM,gBAAgB,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;IACxE,gBAAgB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAEnE,MAAM,iBAAiB,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;IAC1E,iBAAiB,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAEjE,OAAO,CACL,KAAC,YAAY,IAAC,SAAS,EAAE,KAAK,CAAC,qBAAqB,EAAE,SAAS,CAAC,KAAM,IAAI,YACxE,KAAC,QAAQ,IACP,SAAS,EAAC,QAAQ,EAClB,KAAK,EAAE,KAAC,OAAO,IAAC,WAAW,EAAC,IAAI,EAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAC,qBAAqB,GAAG,YAEjF,eAAK,SAAS,EAAC,wBAAwB,aACrC,0BACG,aAAa,CAAC,CAAC,CAAC,CACf,KAAC,aAAa,IAAC,SAAS,EAAC,OAAO,EAAC,qBAAqB,EAAE,aAAa,GAAI,CAC1E,CAAC,CAAC,CAAC,IAAI,EACR,KAAC,eAAe,IAAC,OAAO,EAAE,aAAa,EAAE,OAAO,GAAI,IAChD,EACL,aAAa,CAAC,MAAM,IAAI,gBAAgB,CAAC,MAAM,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,CAC7E,KAAC,0BAA0B,IACzB,SAAS,EAAC,MAAM,EAChB,gBAAgB,EAAE,gBAAgB,EAClC,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM,GACd,CACH,CAAC,CAAC,CAAC,IAAI,IACJ,GACG,GACE,CAChB,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,UAAmC,EAAE,EAAE;IAC/D,OAAO,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;AACzF,CAAC,CAAC"}

package/lib/components/ExchangeRateTile/useFetchExchangeRateData.d.ts

@@ -1,17 +1,9 @@
 import { type ExchangeCurrencyItem } from '../../components/ExchangeRateTile/ExchangeCurrencyCalculator';
+import { type RegionData } from '../../hooks/useLocation';
 export interface ExchangeData {
     exchangeRate?: {
         currencies?: ExchangeCurrencyItem[];
     };
     address?: string;
 }
-export interface RegionData {
-    id?: number;
-    code?: string;
-    name?: string;
-}
-export declare function useFetchExchangeRateData(): {
-    region?: RegionData | undefined;
-    exchangeRates?: ExchangeData | undefined;
-};
-export declare function useCurrentPosition(): RegionData;
+export declare function useFetchExchangeRateData(currentRegion: RegionData): ExchangeData;

package/lib/components/ExchangeRateTile/useFetchExchangeRateData.js

@@ -1,39 +1,9 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import { fetchJSONUnsafe } from '../../utils/fetchJSON.js';
 const EXCHANGE_RATES_URL = '/api/v1/exchangerates';
-const REGION_URL = '/api/v1/region';
-export function useFetchExchangeRateData() {
-    const { data } = useAsyncData(EXCHANGE_RATES_URL, fetchData);
+export function useFetchExchangeRateData(currentRegion) {
+    const regionCode = currentRegion?.code || '000';
+    const { data } = useAsyncData(EXCHANGE_RATES_URL + `?regionCode=${regionCode}`, fetchJSONUnsafe);
     return data || {};
 }
-export function useCurrentPosition() {
-    const { data } = useAsyncData(REGION_URL, 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, { 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 {};
-    }
-};
 //# sourceMappingURL=useFetchExchangeRateData.js.map

package/lib/components/ExchangeRateTile/useFetchExchangeRateData.js.map

@@ -1 +1 @@
-{"version":3,"file":"useFetchExchangeRateData.js","sourceRoot":"","sources":["../../../src/components/ExchangeRateTile/useFetchExchangeRateData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAExE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAexD,MAAM,kBAAkB,GAAG,uBAAuB,CAAC;AACnD,MAAM,UAAU,GAAG,gBAAgB,CAAC;AAEpC,MAAM,UAAU,wBAAwB;IACtC,MAAM,EAAE,IAAI,EAAE,GAAG,YAAY,CAG1B,kBAAkB,EAAE,SAAS,CAAC,CAAC;IAElC,OAAO,IAAI,IAAI,EAAE,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,kBAAkB;IAChC,MAAM,EAAE,IAAI,EAAE,GAAG,YAAY,CAAa,UAAU,EAAE,eAAe,CAAC,CAAC;IAEvE,OAAO,IAAI,IAAI,EAAE,CAAC;AACpB,CAAC;AAED,MAAM,SAAS,GAAG,KAAK,EACrB,gBAAwB,EAIvB,EAAE;IACH,MAAM,MAAM,GAAG,MAAM,WAAW,EAAE,CAAC;IAEnC,MAAM,UAAU,GAAG,MAAM,EAAE,IAAI,IAAI,KAAK,CAAC;IAEzC,MAAM,aAAa,GAAG,MAAM,kBAAkB,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;IAE7E,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;AACnC,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,KAAK,IAAyB,EAAE;IAClD,IAAI;QACF,OAAO,MAAM,eAAe,CAAa,UAAU,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;KACzE;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAEnB,OAAO,EAAE,CAAC;KACX;AACH,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,KAAK,EAAE,GAAW,EAAE,UAAkB,EAAyB,EAAE;IAC1F,IAAI;QACF,OAAO,MAAM,eAAe,CAAe,GAAG,GAAG,eAAe,UAAU,EAAE,EAAE;YAC5E,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;KACJ;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAEnB,OAAO,EAAE,CAAC;KACX;AACH,CAAC,CAAC"}
+{"version":3,"file":"useFetchExchangeRateData.js","sourceRoot":"","sources":["../../../src/components/ExchangeRateTile/useFetchExchangeRateData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAGxE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AASxD,MAAM,kBAAkB,GAAG,uBAAuB,CAAC;AAEnD,MAAM,UAAU,wBAAwB,CAAC,aAAyB;IAChE,MAAM,UAAU,GAAG,aAAa,EAAE,IAAI,IAAI,KAAK,CAAC;IAEhD,MAAM,EAAE,IAAI,EAAE,GAAG,YAAY,CAC3B,kBAAkB,GAAG,eAAe,UAAU,EAAE,EAChD,eAAe,CAChB,CAAC;IAEF,OAAO,IAAI,IAAI,EAAE,CAAC;AACpB,CAAC"}

package/mobile/bundle/bundle.umd.js

@@ -3315,6 +3315,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";
@@ -3445,40 +3487,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 } });
@@ -3834,48 +3851,6 @@
     MortgageFiltration.childrenTypes = ['ProductTile'];
     MortgageFiltration.childSchema = (content) => content?.filtrationSchema || {};
 
-    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
-        }
-    };
-
     function renderClusterer(yandexMaps, map, points) {
         map.geoObjects.removeAll();
         const clusterIconContentLayout = yandexMaps.templateLayoutFactory.createClass('<div style="margin-top: -3px;">{{properties.geoObjects.length}}</div>');
@@ -5454,7 +5429,7 @@
 
     const joinList = (sep) => (list) => list.reduce((acc, el, i) => (acc.length ? acc.concat({ ...sep, key: `sep-${i}` }, el) : [el]), []);
 
-    const packageVersion = "0.14.58";
+    const packageVersion = "0.14.59";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;