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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (31) hide show
  1. package/bundle/bundle.umd.js +48 -73
  2. package/bundle/bundle.umd.min.js +1 -1
  3. package/bundle/components/ExchangeRateTile/useFetchExchangeRateData.d.ts +2 -10
  4. package/dist/components/ExchangeRateTile/ExchangeRateTile.js +3 -1
  5. package/dist/components/ExchangeRateTile/ExchangeRateTile.js.map +1 -1
  6. package/dist/components/ExchangeRateTile/useFetchExchangeRateData.d.ts +2 -10
  7. package/dist/components/ExchangeRateTile/useFetchExchangeRateData.js +4 -35
  8. package/dist/components/ExchangeRateTile/useFetchExchangeRateData.js.map +1 -1
  9. package/lib/components/ExchangeRateTile/ExchangeRateTile.js +3 -1
  10. package/lib/components/ExchangeRateTile/ExchangeRateTile.js.map +1 -1
  11. package/lib/components/ExchangeRateTile/useFetchExchangeRateData.d.ts +2 -10
  12. package/lib/components/ExchangeRateTile/useFetchExchangeRateData.js +3 -33
  13. package/lib/components/ExchangeRateTile/useFetchExchangeRateData.js.map +1 -1
  14. package/mobile/bundle/bundle.umd.js +48 -73
  15. package/mobile/bundle/bundle.umd.min.js +1 -1
  16. package/mobile/bundle/components/ExchangeRateTile/useFetchExchangeRateData.d.ts +2 -10
  17. package/mobile/dist/components/ExchangeRateTile/ExchangeRateTile.js +3 -1
  18. package/mobile/dist/components/ExchangeRateTile/ExchangeRateTile.js.map +1 -1
  19. package/mobile/dist/components/ExchangeRateTile/useFetchExchangeRateData.d.ts +2 -10
  20. package/mobile/dist/components/ExchangeRateTile/useFetchExchangeRateData.js +4 -35
  21. package/mobile/dist/components/ExchangeRateTile/useFetchExchangeRateData.js.map +1 -1
  22. package/mobile/lib/components/ExchangeRateTile/ExchangeRateTile.js +3 -1
  23. package/mobile/lib/components/ExchangeRateTile/ExchangeRateTile.js.map +1 -1
  24. package/mobile/lib/components/ExchangeRateTile/useFetchExchangeRateData.d.ts +2 -10
  25. package/mobile/lib/components/ExchangeRateTile/useFetchExchangeRateData.js +3 -33
  26. package/mobile/lib/components/ExchangeRateTile/useFetchExchangeRateData.js.map +1 -1
  27. package/mobile/src/components/ExchangeRateTile/ExchangeRateTile.tsx +3 -1
  28. package/mobile/src/components/ExchangeRateTile/useFetchExchangeRateData.ts +7 -54
  29. package/package.json +1 -1
  30. package/src/components/ExchangeRateTile/ExchangeRateTile.tsx +3 -1
  31. package/src/components/ExchangeRateTile/useFetchExchangeRateData.ts +7 -54
package/mobile/bundle/components/ExchangeRateTile/useFetchExchangeRateData.d.ts CHANGED
@@ -1,17 +1,9 @@
1
1
  import { type ExchangeCurrencyItem } from '../../components/ExchangeRateTile/ExchangeCurrencyCalculator';
2
+ import { type RegionData } from '../../hooks/useLocation';
2
3
  export interface ExchangeData {
3
4
  exchangeRate?: {
4
5
  currencies?: ExchangeCurrencyItem[];
5
6
  };
6
7
  address?: string;
7
8
  }
8
- export interface RegionData {
9
- id?: number;
10
- code?: string;
11
- name?: string;
12
- }
13
- export declare function useFetchExchangeRateData(): {
14
- region?: RegionData | undefined;
15
- exchangeRates?: ExchangeData | undefined;
16
- };
17
- export declare function useCurrentPosition(): RegionData;
9
+ export declare function useFetchExchangeRateData(currentRegion: RegionData): ExchangeData;
package/mobile/dist/components/ExchangeRateTile/ExchangeRateTile.js CHANGED
@@ -2,6 +2,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
2
2
  exports.ExchangeRateTile = void 0;
3
3
  const jsx_runtime_1 = require("@redneckz/uni-jsx/jsx-runtime");
4
4
  const uni_jsx_1 = require("@redneckz/uni-jsx");
5
+ const useLocation_1 = require("../../hooks/useLocation");
5
6
  const BaseTile_1 = require("../../ui-kit/BaseTile/BaseTile");
6
7
  const BlockWrapper_1 = require("../../ui-kit/BlockWrapper");
7
8
  const Heading_1 = require("../../ui-kit/Heading/Heading");
@@ -12,7 +13,8 @@ const CurrentLocation_1 = require("./CurrentLocation");
12
13
  const ExchangeCurrencyCalculator_1 = require("./ExchangeCurrencyCalculator");
13
14
  const useFetchExchangeRateData_1 = require("./useFetchExchangeRateData");
14
15
  exports.ExchangeRateTile = (0, uni_jsx_1.JSX)(({ className = '', title = 'Курсы обмена валют', button, ...rest }) => {
15
- const { exchangeRates } = (0, useFetchExchangeRateData_1.useFetchExchangeRateData)();
16
+ const [currentLocation] = (0, useLocation_1.useLocation)();
17
+ const exchangeRates = (0, useFetchExchangeRateData_1.useFetchExchangeRateData)(currentLocation);
16
18
  const currencyRates = getCurrencyRates(exchangeRates?.exchangeRate?.currencies);
17
19
  const currencyRatesBuy = currencyRates.filter((_) => _.buyExchangeRate);
18
20
  currencyRatesBuy.unshift({ currency: { currency: CurrencyProps_1.Currency.RUB } });
package/mobile/dist/components/ExchangeRateTile/ExchangeRateTile.js.map CHANGED
@@ -1 +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"}
1
+ {"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/mobile/dist/components/ExchangeRateTile/useFetchExchangeRateData.d.ts CHANGED
@@ -1,17 +1,9 @@
1
1
  import { type ExchangeCurrencyItem } from '../../components/ExchangeRateTile/ExchangeCurrencyCalculator';
2
+ import { type RegionData } from '../../hooks/useLocation';
2
3
  export interface ExchangeData {
3
4
  exchangeRate?: {
4
5
  currencies?: ExchangeCurrencyItem[];
5
6
  };
6
7
  address?: string;
7
8
  }
8
- export interface RegionData {
9
- id?: number;
10
- code?: string;
11
- name?: string;
12
- }
13
- export declare function useFetchExchangeRateData(): {
14
- region?: RegionData | undefined;
15
- exchangeRates?: ExchangeData | undefined;
16
- };
17
- export declare function useCurrentPosition(): RegionData;
9
+ export declare function useFetchExchangeRateData(currentRegion: RegionData): ExchangeData;
package/mobile/dist/components/ExchangeRateTile/useFetchExchangeRateData.js CHANGED
@@ -1,43 +1,12 @@
1
1
  Object.defineProperty(exports, "__esModule", { value: true });
2
- exports.useCurrentPosition = exports.useFetchExchangeRateData = void 0;
2
+ exports.useFetchExchangeRateData = void 0;
3
3
  const useAsyncData_1 = require("@redneckz/uni-jsx/lib/hooks/useAsyncData");
4
4
  const fetchJSON_1 = require("../../utils/fetchJSON");
5
5
  const EXCHANGE_RATES_URL = '/api/v1/exchangerates';
6
- const REGION_URL = '/api/v1/region';
7
- function useFetchExchangeRateData() {
8
- const { data } = (0, useAsyncData_1.useAsyncData)(EXCHANGE_RATES_URL, fetchData);
6
+ function useFetchExchangeRateData(currentRegion) {
7
+ const regionCode = currentRegion?.code || '000';
8
+ const { data } = (0, useAsyncData_1.useAsyncData)(EXCHANGE_RATES_URL + `?regionCode=${regionCode}`, fetchJSON_1.fetchJSONUnsafe);
9
9
  return data || {};
10
10
  }
11
11
  exports.useFetchExchangeRateData = useFetchExchangeRateData;
12
- function useCurrentPosition() {
13
- const { data } = (0, useAsyncData_1.useAsyncData)(REGION_URL, fetchJSON_1.fetchJSONUnsafe);
14
- return data || {};
15
- }
16
- exports.useCurrentPosition = useCurrentPosition;
17
- const fetchData = async (urlExchangeRates) => {
18
- const region = await fetchRegion();
19
- const regionCode = region?.code || '000';
20
- const exchangeRates = await fetchExchangeRates(urlExchangeRates, regionCode);
21
- return { region, exchangeRates };
22
- };
23
- const fetchRegion = async () => {
24
- try {
25
- return await (0, fetchJSON_1.fetchJSONUnsafe)(REGION_URL, { method: 'GET' });
26
- }
27
- catch (error) {
28
- console.log(error);
29
- return {};
30
- }
31
- };
32
- const fetchExchangeRates = async (url, regionCode) => {
33
- try {
34
- return await (0, fetchJSON_1.fetchJSONUnsafe)(url + `?regionCode=${regionCode}`, {
35
- method: 'GET',
36
- });
37
- }
38
- catch (error) {
39
- console.log(error);
40
- return {};
41
- }
42
- };
43
12
  //# sourceMappingURL=useFetchExchangeRateData.js.map
package/mobile/dist/components/ExchangeRateTile/useFetchExchangeRateData.js.map CHANGED
@@ -1 +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"}
1
+ {"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/mobile/lib/components/ExchangeRateTile/ExchangeRateTile.js CHANGED
@@ -1,5 +1,6 @@
1
1
  import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
2
2
  import { JSX } from '@redneckz/uni-jsx';
3
+ import { useLocation } from '../../hooks/useLocation.js';
3
4
  import { BaseTile } from '../../ui-kit/BaseTile/BaseTile.js';
4
5
  import { BlockWrapper } from '../../ui-kit/BlockWrapper.js';
5
6
  import { Heading } from '../../ui-kit/Heading/Heading.js';
@@ -10,7 +11,8 @@ import { CurrentLocation } from './CurrentLocation.js';
10
11
  import { ExchangeCurrencyCalculator, } from './ExchangeCurrencyCalculator.js';
11
12
  import { useFetchExchangeRateData } from './useFetchExchangeRateData.js';
12
13
  export const ExchangeRateTile = JSX(({ className = '', title = 'Курсы обмена валют', button, ...rest }) => {
13
- const { exchangeRates } = useFetchExchangeRateData();
14
+ const [currentLocation] = useLocation();
15
+ const exchangeRates = useFetchExchangeRateData(currentLocation);
14
16
  const currencyRates = getCurrencyRates(exchangeRates?.exchangeRate?.currencies);
15
17
  const currencyRatesBuy = currencyRates.filter((_) => _.buyExchangeRate);
16
18
  currencyRatesBuy.unshift({ currency: { currency: Currency.RUB } });
package/mobile/lib/components/ExchangeRateTile/ExchangeRateTile.js.map CHANGED
@@ -1 +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"}
1
+ {"version":3,"file":"ExchangeRateTile.js","sourceRoot":"","sources":["../../../src/components/ExchangeRateTile/ExchangeRateTile.tsx"],"names":[],"mappings":"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"}
package/mobile/lib/components/ExchangeRateTile/useFetchExchangeRateData.d.ts CHANGED
@@ -1,17 +1,9 @@
1
1
  import { type ExchangeCurrencyItem } from '../../components/ExchangeRateTile/ExchangeCurrencyCalculator';
2
+ import { type RegionData } from '../../hooks/useLocation';
2
3
  export interface ExchangeData {
3
4
  exchangeRate?: {
4
5
  currencies?: ExchangeCurrencyItem[];
5
6
  };
6
7
  address?: string;
7
8
  }
8
- export interface RegionData {
9
- id?: number;
10
- code?: string;
11
- name?: string;
12
- }
13
- export declare function useFetchExchangeRateData(): {
14
- region?: RegionData | undefined;
15
- exchangeRates?: ExchangeData | undefined;
16
- };
17
- export declare function useCurrentPosition(): RegionData;
9
+ export declare function useFetchExchangeRateData(currentRegion: RegionData): ExchangeData;
package/mobile/lib/components/ExchangeRateTile/useFetchExchangeRateData.js CHANGED
@@ -1,39 +1,9 @@
1
1
  import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
2
2
  import { fetchJSONUnsafe } from '../../utils/fetchJSON.js';
3
3
  const EXCHANGE_RATES_URL = '/api/v1/exchangerates';
4
- const REGION_URL = '/api/v1/region';
5
- export function useFetchExchangeRateData() {
6
- const { data } = useAsyncData(EXCHANGE_RATES_URL, fetchData);
4
+ export function useFetchExchangeRateData(currentRegion) {
5
+ const regionCode = currentRegion?.code || '000';
6
+ const { data } = useAsyncData(EXCHANGE_RATES_URL + `?regionCode=${regionCode}`, fetchJSONUnsafe);
7
7
  return data || {};
8
8
  }
9
- export function useCurrentPosition() {
10
- const { data } = useAsyncData(REGION_URL, fetchJSONUnsafe);
11
- return data || {};
12
- }
13
- const fetchData = async (urlExchangeRates) => {
14
- const region = await fetchRegion();
15
- const regionCode = region?.code || '000';
16
- const exchangeRates = await fetchExchangeRates(urlExchangeRates, regionCode);
17
- return { region, exchangeRates };
18
- };
19
- const fetchRegion = async () => {
20
- try {
21
- return await fetchJSONUnsafe(REGION_URL, { method: 'GET' });
22
- }
23
- catch (error) {
24
- console.log(error);
25
- return {};
26
- }
27
- };
28
- const fetchExchangeRates = async (url, regionCode) => {
29
- try {
30
- return await fetchJSONUnsafe(url + `?regionCode=${regionCode}`, {
31
- method: 'GET',
32
- });
33
- }
34
- catch (error) {
35
- console.log(error);
36
- return {};
37
- }
38
- };
39
9
  //# sourceMappingURL=useFetchExchangeRateData.js.map
package/mobile/lib/components/ExchangeRateTile/useFetchExchangeRateData.js.map CHANGED
@@ -1 +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"}
1
+ {"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/src/components/ExchangeRateTile/ExchangeRateTile.tsx CHANGED
@@ -1,4 +1,5 @@
1
1
  import { JSX } from '@redneckz/uni-jsx';
2
+ import { useLocation } from '../../hooks/useLocation';
2
3
  import { type UniBlockProps } from '../../model/JSXBlock';
3
4
  import { BaseTile } from '../../ui-kit/BaseTile/BaseTile';
4
5
  import { BlockWrapper } from '../../ui-kit/BlockWrapper';
@@ -18,7 +19,8 @@ export interface ExchangeRateTileProps extends ExchangeRateTileContent, UniBlock
18
19
 
19
20
  export const ExchangeRateTile = JSX<ExchangeRateTileProps>(
20
21
  ({ className = '', title = 'Курсы обмена валют', button, ...rest }) => {
21
- const { exchangeRates } = useFetchExchangeRateData();
22
+ const [currentLocation] = useLocation();
23
+ const exchangeRates = useFetchExchangeRateData(currentLocation);
22
24
 
23
25
  const currencyRates = getCurrencyRates(exchangeRates?.exchangeRate?.currencies);
24
26
 
package/mobile/src/components/ExchangeRateTile/useFetchExchangeRateData.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
2
2
  import { type ExchangeCurrencyItem } from '../../components/ExchangeRateTile/ExchangeCurrencyCalculator';
3
+ import { type RegionData } from '../../hooks/useLocation';
3
4
  import { fetchJSONUnsafe } from '../../utils/fetchJSON';
4
5
 
5
6
  export interface ExchangeData {
@@ -9,63 +10,15 @@ export interface ExchangeData {
9
10
  address?: string;
10
11
  }
11
12
 
12
- export interface RegionData {
13
- id?: number;
14
- code?: string;
15
- name?: string;
16
- }
17
-
18
13
  const EXCHANGE_RATES_URL = '/api/v1/exchangerates';
19
- const REGION_URL = '/api/v1/region';
20
14
 
21
- export function useFetchExchangeRateData() {
22
- const { data } = useAsyncData<{
23
- region?: RegionData;
24
- exchangeRates?: ExchangeData;
25
- }>(EXCHANGE_RATES_URL, fetchData);
15
+ export function useFetchExchangeRateData(currentRegion: RegionData) {
16
+ const regionCode = currentRegion?.code || '000';
26
17
 
27
- return data || {};
28
- }
29
-
30
- export function useCurrentPosition() {
31
- const { data } = useAsyncData<RegionData>(REGION_URL, fetchJSONUnsafe);
18
+ const { data } = useAsyncData<ExchangeData>(
19
+ EXCHANGE_RATES_URL + `?regionCode=${regionCode}`,
20
+ fetchJSONUnsafe,
21
+ );
32
22
 
33
23
  return data || {};
34
24
  }
35
-
36
- const fetchData = async (
37
- urlExchangeRates: string,
38
- ): Promise<{
39
- region: RegionData;
40
- exchangeRates: ExchangeData;
41
- }> => {
42
- const region = await fetchRegion();
43
-
44
- const regionCode = region?.code || '000';
45
-
46
- const exchangeRates = await fetchExchangeRates(urlExchangeRates, regionCode);
47
-
48
- return { region, exchangeRates };
49
- };
50
-
51
- const fetchRegion = async (): Promise<RegionData> => {
52
- try {
53
- return await fetchJSONUnsafe<RegionData>(REGION_URL, { method: 'GET' });
54
- } catch (error) {
55
- console.log(error);
56
-
57
- return {};
58
- }
59
- };
60
-
61
- const fetchExchangeRates = async (url: string, regionCode: string): Promise<ExchangeData> => {
62
- try {
63
- return await fetchJSONUnsafe<ExchangeData>(url + `?regionCode=${regionCode}`, {
64
- method: 'GET',
65
- });
66
- } catch (error) {
67
- console.log(error);
68
-
69
- return {};
70
- }
71
- };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@redneckz/wildless-cms-uni-blocks",
3
- "version": "0.14.59",
3
+ "version": "0.14.60",
4
4
  "private": false,
5
5
  "license": "MIT",
6
6
  "author": "ЦК",
package/src/components/ExchangeRateTile/ExchangeRateTile.tsx CHANGED
@@ -1,4 +1,5 @@
1
1
  import { JSX } from '@redneckz/uni-jsx';
2
+ import { useLocation } from '../../hooks/useLocation';
2
3
  import { type UniBlockProps } from '../../model/JSXBlock';
3
4
  import { BaseTile } from '../../ui-kit/BaseTile/BaseTile';
4
5
  import { BlockWrapper } from '../../ui-kit/BlockWrapper';
@@ -18,7 +19,8 @@ export interface ExchangeRateTileProps extends ExchangeRateTileContent, UniBlock
18
19
 
19
20
  export const ExchangeRateTile = JSX<ExchangeRateTileProps>(
20
21
  ({ className = '', title = 'Курсы обмена валют', button, ...rest }) => {
21
- const { exchangeRates } = useFetchExchangeRateData();
22
+ const [currentLocation] = useLocation();
23
+ const exchangeRates = useFetchExchangeRateData(currentLocation);
22
24
 
23
25
  const currencyRates = getCurrencyRates(exchangeRates?.exchangeRate?.currencies);
24
26
 
package/src/components/ExchangeRateTile/useFetchExchangeRateData.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
2
2
  import { type ExchangeCurrencyItem } from '../../components/ExchangeRateTile/ExchangeCurrencyCalculator';
3
+ import { type RegionData } from '../../hooks/useLocation';
3
4
  import { fetchJSONUnsafe } from '../../utils/fetchJSON';
4
5
 
5
6
  export interface ExchangeData {
@@ -9,63 +10,15 @@ export interface ExchangeData {
9
10
  address?: string;
10
11
  }
11
12
 
12
- export interface RegionData {
13
- id?: number;
14
- code?: string;
15
- name?: string;
16
- }
17
-
18
13
  const EXCHANGE_RATES_URL = '/api/v1/exchangerates';
19
- const REGION_URL = '/api/v1/region';
20
14
 
21
- export function useFetchExchangeRateData() {
22
- const { data } = useAsyncData<{
23
- region?: RegionData;
24
- exchangeRates?: ExchangeData;
25
- }>(EXCHANGE_RATES_URL, fetchData);
15
+ export function useFetchExchangeRateData(currentRegion: RegionData) {
16
+ const regionCode = currentRegion?.code || '000';
26
17
 
27
- return data || {};
28
- }
29
-
30
- export function useCurrentPosition() {
31
- const { data } = useAsyncData<RegionData>(REGION_URL, fetchJSONUnsafe);
18
+ const { data } = useAsyncData<ExchangeData>(
19
+ EXCHANGE_RATES_URL + `?regionCode=${regionCode}`,
20
+ fetchJSONUnsafe,
21
+ );
32
22
 
33
23
  return data || {};
34
24
  }
35
-
36
- const fetchData = async (
37
- urlExchangeRates: string,
38
- ): Promise<{
39
- region: RegionData;
40
- exchangeRates: ExchangeData;
41
- }> => {
42
- const region = await fetchRegion();
43
-
44
- const regionCode = region?.code || '000';
45
-
46
- const exchangeRates = await fetchExchangeRates(urlExchangeRates, regionCode);
47
-
48
- return { region, exchangeRates };
49
- };
50
-
51
- const fetchRegion = async (): Promise<RegionData> => {
52
- try {
53
- return await fetchJSONUnsafe<RegionData>(REGION_URL, { method: 'GET' });
54
- } catch (error) {
55
- console.log(error);
56
-
57
- return {};
58
- }
59
- };
60
-
61
- const fetchExchangeRates = async (url: string, regionCode: string): Promise<ExchangeData> => {
62
- try {
63
- return await fetchJSONUnsafe<ExchangeData>(url + `?regionCode=${regionCode}`, {
64
- method: 'GET',
65
- });
66
- } catch (error) {
67
- console.log(error);
68
-
69
- return {};
70
- }
71
- };