@redneckz/wildless-cms-uni-blocks 0.14.521 → 0.14.523

package/mobile/lib/components/OfficesAtmsMap/OfficesMap.js

@@ -32,8 +32,8 @@ const FILTRATION_PREDICATES = {
 export const OfficesMap = JSX(({ className }) => {
     const [currentLocation] = useLocation();
     const regionCode = currentLocation?.code ?? '000';
-    const officesData = useOffices(regionCode);
-    return (_jsx(OfficesAtmsMapLayout, { className: className, filterItems: filterItems, data: officesData?.branches, remoteWorkplaces: officesData?.remoteWorkplaces, initFilterState: INITIAL_FILTRATION_STATE, renderCard: renderOfficeCard, renderRemoteWorkplaceCard: renderRemoteWorkplaceCard, getBalloon: getOfficePoint, getBalloonRemoteWorkplaces: getRemoteWorkplacePoint, title: `Офисы филиала ${currentLocation?.name}` }));
+    const { data, isLoad } = useOffices(regionCode);
+    return (_jsx(OfficesAtmsMapLayout, { className: className, filterItems: filterItems, data: data?.branches, isLoad: isLoad, remoteWorkplaces: data?.remoteWorkplaces, initFilterState: INITIAL_FILTRATION_STATE, renderCard: renderOfficeCard, renderRemoteWorkplaceCard: renderRemoteWorkplaceCard, getBalloon: getOfficePoint, getBalloonRemoteWorkplaces: getRemoteWorkplacePoint, title: `Офисы филиала ${currentLocation?.name}` }));
 });
 const filterItems = (data, filtrationState) => {
     const truthyFilters = Object.keys(filtrationState).filter((key) => filtrationState[key]);

package/mobile/lib/components/OfficesAtmsMap/OfficesMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"OfficesMap.js","sourceRoot":"","sources":["../../../src/components/OfficesAtmsMap/OfficesMap.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"OfficesMap.js","sourceRoot":"","sources":["../../../src/components/OfficesAtmsMap/OfficesMap.tsx"],"names":[],"mappings":"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"}

package/mobile/lib/components/OfficesAtmsMap/useAtms.d.ts

@@ -1,2 +1,5 @@
 import { type Atm } from './OfficesAtmsMapProps';
-export declare function useAtms(regionCode?: string): Atm[];
+export declare function useAtms(regionCode?: string): {
+    data: Atm[];
+    isLoad: boolean;
+};

package/mobile/lib/components/OfficesAtmsMap/useAtms.js

@@ -2,8 +2,9 @@ import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import { fetchJSON } from '../../utils/fetchJSON.js';
 const EMPTY_VALUE = [];
 export function useAtms(regionCode) {
-    const { data = EMPTY_VALUE } = useAsyncData(`/api/v1/atms?regionCode=${regionCode}`, fetchMap);
-    return data;
+    const { data, error } = useAsyncData(`/api/v1/atms?regionCode=${regionCode}`, fetchMap);
+    const isLoad = !data && !error;
+    return { data: data || EMPTY_VALUE, isLoad };
 }
 const fetchMap = async (url) => {
     const result = await fetchJSON(url, { method: 'GET' });

package/mobile/lib/components/OfficesAtmsMap/useAtms.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAtms.js","sourceRoot":"","sources":["../../../src/components/OfficesAtmsMap/useAtms.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAGlD,MAAM,WAAW,GAAG,EAAE,CAAC;AAEvB,MAAM,UAAU,OAAO,CAAC,UAAmB;IACzC,MAAM,EAAE,IAAI,GAAG,WAAW,EAAE,GAAG,YAAY,CAAC,2BAA2B,UAAU,EAAE,EAAE,QAAQ,CAAC,CAAC;IAE/F,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,QAAQ,GAAG,KAAK,EAAE,GAAW,EAAkB,EAAE;IACrD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAQ,GAAG,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAE9D,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC;AACtD,CAAC,CAAC"}
+{"version":3,"file":"useAtms.js","sourceRoot":"","sources":["../../../src/components/OfficesAtmsMap/useAtms.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAGlD,MAAM,WAAW,GAAG,EAAE,CAAC;AAEvB,MAAM,UAAU,OAAO,CAAC,UAAmB;IACzC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,YAAY,CAAC,2BAA2B,UAAU,EAAE,EAAE,QAAQ,CAAC,CAAC;IACxF,MAAM,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC;IAE/B,OAAO,EAAE,IAAI,EAAE,IAAI,IAAI,WAAW,EAAE,MAAM,EAAE,CAAC;AAC/C,CAAC;AAED,MAAM,QAAQ,GAAG,KAAK,EAAE,GAAW,EAAkB,EAAE;IACrD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAQ,GAAG,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAE9D,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC;AACtD,CAAC,CAAC"}

package/mobile/lib/components/OfficesAtmsMap/useOffices.d.ts

@@ -1,5 +1,8 @@
 import { type Branch, type RemoteWorkplace } from './OfficesAtmsMapProps';
 export declare function useOffices(regionCode?: string): {
-    branches: Branch[];
-    remoteWorkplaces: RemoteWorkplace[];
+    data: {
+        branches: Branch[];
+        remoteWorkplaces: RemoteWorkplace[];
+    };
+    isLoad: boolean;
 };

package/mobile/lib/components/OfficesAtmsMap/useOffices.js

@@ -2,8 +2,9 @@ import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import { fetchJSON } from '../../utils/fetchJSON.js';
 const EMPTY_VALUE = { branches: [], remoteWorkplaces: [] };
 export function useOffices(regionCode) {
-    const { data = EMPTY_VALUE } = useAsyncData(`/api/v1/branchesAndRemoteWorkplaces?regionCode=${regionCode}`, fetchMap);
-    return data;
+    const { data, error } = useAsyncData(`/api/v1/branchesAndRemoteWorkplaces?regionCode=${regionCode}`, fetchMap);
+    const isLoad = !data && !error;
+    return { data: data || EMPTY_VALUE, isLoad };
 }
 const fetchMap = async (url) => {
     const result = await fetchJSON(url, {

package/mobile/lib/components/OfficesAtmsMap/useOffices.js.map

@@ -1 +1 @@
-{"version":3,"file":"useOffices.js","sourceRoot":"","sources":["../../../src/components/OfficesAtmsMap/useOffices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAGlD,MAAM,WAAW,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAAC;AAE3D,MAAM,UAAU,UAAU,CAAC,UAAmB;IAC5C,MAAM,EAAE,IAAI,GAAG,WAAW,EAAE,GAAG,YAAY,CACzC,kDAAkD,UAAU,EAAE,EAC9D,QAAQ,CACT,CAAC;IAEF,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,QAAQ,GAAG,KAAK,EACpB,GAAW,EAC2D,EAAE;IACxE,MAAM,MAAM,GAAG,MAAM,SAAS,CAA8D,GAAG,EAAE;QAC/F,MAAM,EAAE,KAAK;KACd,CAAC,CAAC;IAEH,OAAO,MAAM,IAAI,WAAW,CAAC;AAC/B,CAAC,CAAC"}
+{"version":3,"file":"useOffices.js","sourceRoot":"","sources":["../../../src/components/OfficesAtmsMap/useOffices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAGlD,MAAM,WAAW,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAAC;AAE3D,MAAM,UAAU,UAAU,CAAC,UAAmB;IAC5C,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,YAAY,CAClC,kDAAkD,UAAU,EAAE,EAC9D,QAAQ,CACT,CAAC;IACF,MAAM,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC;IAE/B,OAAO,EAAE,IAAI,EAAE,IAAI,IAAI,WAAW,EAAE,MAAM,EAAE,CAAC;AAC/C,CAAC;AAED,MAAM,QAAQ,GAAG,KAAK,EACpB,GAAW,EAC2D,EAAE;IACxE,MAAM,MAAM,GAAG,MAAM,SAAS,CAA8D,GAAG,EAAE;QAC/F,MAAM,EAAE,KAAK;KACd,CAAC,CAAC;IAEH,OAAO,MAAM,IAAI,WAAW,CAAC;AAC/B,CAAC,CAAC"}

package/mobile/lib/ui-kit/YandexMap/YandexMap.d.ts

@@ -1,8 +1,9 @@
 import { type BalloonPoints } from '../../components/OfficesAtmsMap/YandexMapProps';
 interface YandexMapProps {
-    points: BalloonPoints[];
+    points?: BalloonPoints[];
     className?: string;
     zoom?: number;
+    isLoad?: boolean;
 }
 export declare const YandexMap: import("@redneckz/uni-jsx").UNIComponent<YandexMapProps, any, any>;
 export {};

package/mobile/lib/ui-kit/YandexMap/YandexMap.js

@@ -4,6 +4,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useRef } from '@redneckz/uni-jsx/lib/hooks';
 import { style } from '../../utils/style.js';
+import { Loader } from '../Loader/Loader.js';
 import { renderClusterer } from './renderClusterer.js';
 import { renderUserGeolocation } from './renderUserGeolocation.js';
 import { useYandexMaps } from './useYandexMaps.js';
@@ -13,17 +14,19 @@ const DEFAULT_CENTER_COORDS = [55.753995, 37.614069];
 //       Сейчас реализован поиск среди тестовых данных
 // TODO: Также выяснить что делать когда ничего не найдено
 // TODO: На макетах также когда есть поле поиска нет кнопки открыть на карте.
-export const YandexMap = JSX(({ points, className = '', zoom = 5 }) => {
+export const YandexMap = JSX(({ points, className = '', zoom = 5, isLoad }) => {
     const map = useRef(null);
     const yandexMaps = useYandexMaps();
     useEffect(() => {
-        if (!points?.length) {
-            return;
+        if (map.current) {
+            renderClusterer({ yandexMaps, map: map.current, points, isLoad });
+            map.current.setCenter(getCenterPoint(points));
         }
-        if (!map?.current) {
+        else {
             yandexMaps?.ready(() => {
                 // Ready function may be called few times, but must be called once
                 if (map.current) {
+                    renderClusterer({ yandexMaps, map: map.current, points, isLoad });
                     return;
                 }
                 map.current = new yandexMaps.Map('map', {
@@ -32,19 +35,15 @@ export const YandexMap = JSX(({ points, className = '', zoom = 5 }) => {
                     controls: [],
                     suppressMapOpenBlock: true,
                 });
-                renderClusterer({ yandexMaps, map: map.current, points });
+                renderClusterer({ yandexMaps, map: map.current, points, isLoad });
             });
         }
-        else if (yandexMaps) {
-            renderClusterer({ yandexMaps, map: map.current, points });
-            map.current.setCenter(getCenterPoint(points));
-        }
-    }, [yandexMaps, points, zoom]);
+    }, [yandexMaps, points, zoom, isLoad]);
     if (!yandexMaps) {
         return null;
     }
     const zIndex = 'z-10';
-    return (_jsxs("div", { id: "map", className: style('relative', 'w-full', className), children: [_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", { 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))] }));
 });
 const getCenterPoint = (points) => {
     const centerCoords = [
@@ -53,6 +52,6 @@ const getCenterPoint = (points) => {
     ];
     return centerCoords.every((_) => _) ? centerCoords : DEFAULT_CENTER_COORDS;
 };
-const mapByIndex = (points, index) => points.map((_) => _.coords[index]);
+const mapByIndex = (points, index) => points.map((_) => _.coords?.[index]);
 const getArraySumAndAverage = (arr) => arr.length && arr.reduce((a, b) => a + b) / arr.length;
 //# sourceMappingURL=YandexMap.js.map

package/mobile/lib/ui-kit/YandexMap/YandexMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"YandexMap.js","sourceRoot":"","sources":["../../../src/ui-kit/YandexMap/YandexMap.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"YandexMap.js","sourceRoot":"","sources":["../../../src/ui-kit/YandexMap/YandexMap.tsx"],"names":[],"mappings":"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"}

package/mobile/lib/ui-kit/YandexMap/renderClusterer.d.ts

@@ -1,7 +1,8 @@
 import type ymaps from 'yandex-maps';
 import { type BalloonPoints } from '../../components/OfficesAtmsMap/YandexMapProps';
-export declare function renderClusterer({ yandexMaps, map, points, }: {
+export declare function renderClusterer({ yandexMaps, map, points, isLoad, }: {
     yandexMaps: typeof ymaps;
     map: ymaps.Map;
     points: BalloonPoints[];
+    isLoad: boolean;
 }): void;

package/mobile/lib/ui-kit/YandexMap/renderClusterer.js

@@ -1,6 +1,9 @@
 const MapMarkerClusterIcon = '/icons/MapMarkerClusterIcon.svg';
 const MapMarkerClusterYellowIcon = '/icons/MapMarkerClusterYellowIcon.svg';
-export function renderClusterer({ yandexMaps, map, points, }) {
+export function renderClusterer({ yandexMaps, map, points, isLoad, }) {
+    if (isLoad || !points?.length) {
+        return;
+    }
     map.geoObjects.removeAll();
     const clusterIconContentLayout = yandexMaps.templateLayoutFactory.createClass('<div style="margin-top: -3px;">{{properties.geoObjects.length}}</div>');
     const officeClusterer = defineClusterer('offices', yandexMaps, clusterIconContentLayout);

package/mobile/lib/ui-kit/YandexMap/renderClusterer.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderClusterer.js","sourceRoot":"","sources":["../../../src/ui-kit/YandexMap/renderClusterer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"renderClusterer.js","sourceRoot":"","sources":["../../../src/ui-kit/YandexMap/renderClusterer.ts"],"names":[],"mappings":"AAMA,MAAM,oBAAoB,GAAG,iCAAiC,CAAC;AAC/D,MAAM,0BAA0B,GAAG,uCAAuC,CAAC;AAE3E,MAAM,UAAU,eAAe,CAAC,EAC9B,UAAU,EACV,GAAG,EACH,MAAM,EACN,MAAM,GAMP;IACC,IAAI,MAAM,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE;QAC7B,OAAO;KACR;IAED,GAAG,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;IAE3B,MAAM,wBAAwB,GAAG,UAAU,CAAC,qBAAqB,CAAC,WAAW,CAC3E,uEAAuE,CACxE,CAAC;IAEF,MAAM,eAAe,GAAG,eAAe,CAAC,SAAS,EAAE,UAAU,EAAE,wBAAwB,CAAC,CAAC;IAEzF,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,CAAC,EAAE;QACrD,MAAM,wBAAwB,GAAG,eAAe,CAC9C,YAAY,EACZ,UAAU,EACV,wBAAwB,CACzB,CAAC;QAEF,MAAM,yBAAyB,GAAG,gBAAgB,CAChD,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAC,EAC7C,YAAY,EACZ,UAAU,CACX,CAAC;QAEF,MAAM,iBAAiB,GAAG,gBAAgB,CACxC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,EAC1C,SAAS,EACT,UAAU,CACX,CAAC;QAEF,eAAe,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QACvC,wBAAwB,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;QAExD,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,wBAA+B,CAAC,CAAC;QACpD,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,eAAsB,CAAC,CAAC;KAC5C;SAAM;QACL,MAAM,UAAU,GAAG,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;QACnE,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAChC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,eAAsB,CAAC,CAAC;KAC5C;IACD,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;QACtF,IAAI,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE;YACtB,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;SACjB;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,eAAe,GAAG,CACtB,IAAY,EACZ,UAAwB,EACxB,wBAAkF,EAClF,EAAE;IACF,OAAO,IAAI,UAAU,CAAC,SAAS,CAAC;QAC9B,YAAY,EAAE;YACZ;gBACE,IAAI,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,0BAA0B;gBAC5E,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;gBACd,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;aACnB;SACF;QACD,wBAAwB;QACxB,4BAA4B,EAAE,KAAK;QACnC,8BAA8B,EAAE,KAAK;KACX,CAAC,CAAC;AAChC,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,QAAyB,EAAE,IAAY,EAAE,UAAwB,EAAE,EAAE;IAC7F,OAAO,QAAQ,CAAC,GAAG,CACjB,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,CACtB,IAAI,UAAU,CAAC,SAAS,CACtB,MAAM,EACN;QACE,oBAAoB,EAAE,OAAO,EAAE,MAAM;QACrC,kBAAkB,EAAE,OAAO,EAAE,IAAI;QACjC,oBAAoB,EAAE,OAAO,EAAE,MAAM;QACrC,WAAW,EAAE,OAAO,EAAE,IAAI;KAC3B,EACD;QACE,UAAU,EAAE,eAAe;QAC3B,aAAa,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,0BAA0B;QACrF,aAAa,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;QACvB,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;KAC5B,CACF,CACJ,CAAC;AACJ,CAAC,CAAC"}

package/mobile/src/api/FileStorage.ts

@@ -1,4 +1,4 @@
-const API_BASE_URI = 'api/v1';
+const API_BASE_URI = '/api/v1';
 const WCMS_FILE_STORAGE_API_URI = '/wcms-file-storage';
 
 export type FileId = string;

package/mobile/src/components/OfficesAtmsMap/AtmsMap.tsx

@@ -25,27 +25,28 @@ const FILTRATION_PREDICATES = {
 };
 
 export interface AtmsMapProps {
-  data?: AtmsDef;
+  descriptionData?: AtmsDef;
   className?: string;
 }
 
-export const AtmsMap = JSX<AtmsMapProps>(({ data, className }) => {
+export const AtmsMap = JSX<AtmsMapProps>(({ descriptionData, className }) => {
   const [currentLocation] = useLocation();
 
   const regionCode = currentLocation?.code ?? '000';
 
-  const officesData = useAtms(regionCode);
+  const { data: officesData, isLoad } = useAtms(regionCode);
 
   return (
     <OfficesAtmsMapLayout
       className={className}
       filterItems={filterItems}
       data={officesData}
+      isLoad={isLoad}
       initFilterState={INITIAL_FILTRATION_STATE}
       renderCard={renderAtmCard}
       getBalloon={getAtmPoint}
       title={`Банкоматы филиала ${currentLocation?.name}`}
-      descriptionData={data}
+      descriptionData={descriptionData}
     />
   );
 });

package/mobile/src/components/OfficesAtmsMap/OfficesAtmsMap.tsx

@@ -13,7 +13,7 @@ export const OfficesAtmsMap = JSX<OfficesAtmsMapProps>(({ data, className, ...re
 
   return (
     <BlockWrapper version="transparent" className={style(className)} defaultPadding="p-0" {...rest}>
-      {dataType === 'offices' ? <OfficesMap /> : <AtmsMap data={data as AtmsDef} />}
+      {dataType === 'offices' ? <OfficesMap /> : <AtmsMap descriptionData={data as AtmsDef} />}
     </BlockWrapper>
   );
 });

package/mobile/src/components/OfficesAtmsMap/OfficesAtmsMapLayout.tsx

@@ -5,7 +5,6 @@ import { type VNode } from '../../model/VNode';
 import { Button } from '../../ui-kit/Button/Button';
 import { ClientOnly } from '../../ui-kit/ClientOnly';
 import { Heading } from '../../ui-kit/Heading/Heading';
-import { Loader } from '../../ui-kit/Loader/Loader';
 import { Text } from '../../ui-kit/Text/Text';
 import { YandexMap } from '../../ui-kit/YandexMap/YandexMap';
 import { getVersion } from '../../utils/getVersion';
@@ -24,6 +23,7 @@ export type InitFilterState = Record<string, boolean>;
 export interface OfficesAtmsMapLayoutProps<T> {
   className?: string;
   data?: T[];
+  isLoad: boolean;
   remoteWorkplaces?: T[];
   renderCard?: (item: T, index: number) => VNode;
   renderRemoteWorkplaceCard?: (item: T, index: number) => VNode;
@@ -42,6 +42,7 @@ export const OfficesAtmsMapLayout = JSX<OfficesAtmsMapLayoutProps<Branch | Atm |
   ({
     className,
     data = [],
+    isLoad,
     remoteWorkplaces = [],
     renderCard = defaultEmptyFunction,
     renderRemoteWorkplaceCard = defaultEmptyFunction,
@@ -53,7 +54,6 @@ export const OfficesAtmsMapLayout = JSX<OfficesAtmsMapLayoutProps<Branch | Atm |
     title,
   }) => {
     const onlyOffice = title?.includes('Офис');
-
     const [filtrationState, { field, reset }] = useForm(initFilterState);
 
     const [filteredItems, points, filteredRemoteWorkplaces, lengthItems] = useMemo(() => {
@@ -87,16 +87,7 @@ export const OfficesAtmsMapLayout = JSX<OfficesAtmsMapLayoutProps<Branch | Atm |
       <div className={style('space-y-1', className)}>
         <div className="bg-white">
           <div className="p-3xl pb-0">
-            <div className="flex flex-col sm:flex-row gap-xs mb-2xl">
-              <Heading headingType="h3">
-                <span suppressHydrationWarning={true}>{title}</span>
-                {lengthItems ? (
-                  <Text size="text-h2" color="text-secondary-text">
-                    <span suppressHydrationWarning={true}>{` (${lengthItems})`}</span>
-                  </Text>
-                ) : null}
-              </Heading>
-            </div>
+            {renderHeading(title, lengthItems)}
             {descriptionData ? renderDescriptionBlock(descriptionData) : null}
             {onlyOffice && renderButtonsGroup(data, activeButton, setActiveButton)}
             <div className={style('pb-3xl', filtersVisibleStyles(activeButton))}>
@@ -105,7 +96,7 @@ export const OfficesAtmsMapLayout = JSX<OfficesAtmsMapLayoutProps<Branch | Atm |
           </div>
           <div className="h-[600px]">
             <ClientOnly>
-              {points?.length ? <YandexMap points={points} className="h-full" /> : <Loader />}
+              <YandexMap points={points} isLoad={isLoad} className="h-full" />
             </ClientOnly>
           </div>
         </div>
@@ -118,6 +109,19 @@ export const OfficesAtmsMapLayout = JSX<OfficesAtmsMapLayoutProps<Branch | Atm |
   },
 );
 
+const renderHeading = (title?: string, lengthItems?: number) => (
+  <div className="flex flex-col sm:flex-row gap-xs mb-2xl">
+    <Heading headingType="h3">
+      <span suppressHydrationWarning={true}>{title}</span>
+      {lengthItems ? (
+        <Text size="text-h2" color="text-secondary-text">
+          <span suppressHydrationWarning={true}>{` (${lengthItems})`}</span>
+        </Text>
+      ) : null}
+    </Heading>
+  </div>
+);
+
 const renderButtonsGroup = (
   data: Branch[],
   activeButton: string,

package/mobile/src/components/OfficesAtmsMap/OfficesMap.tsx

@@ -47,17 +47,16 @@ export interface OfficesMapProps {
 
 export const OfficesMap = JSX<OfficesMapProps>(({ className }) => {
   const [currentLocation] = useLocation();
-
   const regionCode = currentLocation?.code ?? '000';
-
-  const officesData = useOffices(regionCode);
+  const { data, isLoad } = useOffices(regionCode);
 
   return (
     <OfficesAtmsMapLayout
       className={className}
       filterItems={filterItems}
-      data={officesData?.branches}
-      remoteWorkplaces={officesData?.remoteWorkplaces}
+      data={data?.branches}
+      isLoad={isLoad}
+      remoteWorkplaces={data?.remoteWorkplaces}
       initFilterState={INITIAL_FILTRATION_STATE}
       renderCard={renderOfficeCard}
       renderRemoteWorkplaceCard={renderRemoteWorkplaceCard}

package/mobile/src/components/OfficesAtmsMap/useAtms.ts

@@ -5,9 +5,10 @@ import { type Atm } from './OfficesAtmsMapProps';
 const EMPTY_VALUE = [];
 
 export function useAtms(regionCode?: string) {
-  const { data = EMPTY_VALUE } = useAsyncData(`/api/v1/atms?regionCode=${regionCode}`, fetchMap);
+  const { data, error } = useAsyncData(`/api/v1/atms?regionCode=${regionCode}`, fetchMap);
+  const isLoad = !data && !error;
 
-  return data;
+  return { data: data || EMPTY_VALUE, isLoad };
 }
 
 const fetchMap = async (url: string): Promise<Atm[]> => {

package/mobile/src/components/OfficesAtmsMap/useOffices.ts

@@ -5,12 +5,13 @@ import { type Branch, type RemoteWorkplace } from './OfficesAtmsMapProps';
 const EMPTY_VALUE = { branches: [], remoteWorkplaces: [] };
 
 export function useOffices(regionCode?: string) {
-  const { data = EMPTY_VALUE } = useAsyncData(
+  const { data, error } = useAsyncData(
     `/api/v1/branchesAndRemoteWorkplaces?regionCode=${regionCode}`,
     fetchMap,
   );
+  const isLoad = !data && !error;
 
-  return data;
+  return { data: data || EMPTY_VALUE, isLoad };
 }
 
 const fetchMap = async (

package/mobile/src/ui-kit/YandexMap/YandexMap.tsx

@@ -5,15 +5,17 @@ import { useEffect, useRef } from '@redneckz/uni-jsx/lib/hooks';
 import type ymaps from 'yandex-maps';
 import { type BalloonPoints } from '../../components/OfficesAtmsMap/YandexMapProps';
 import { style } from '../../utils/style';
+import { Loader } from '../Loader/Loader';
 import { renderClusterer } from './renderClusterer';
 import { renderUserGeolocation } from './renderUserGeolocation';
 import { useYandexMaps } from './useYandexMaps';
 import { ZoomButton } from './ZoomButton';
 
 interface YandexMapProps {
-  points: BalloonPoints[];
+  points?: BalloonPoints[];
   className?: string;
   zoom?: number;
+  isLoad?: boolean;
 }
 
 const DEFAULT_CENTER_COORDS = [55.753995, 37.614069];
@@ -22,20 +24,22 @@ const DEFAULT_CENTER_COORDS = [55.753995, 37.614069];
 //       Сейчас реализован поиск среди тестовых данных
 // TODO: Также выяснить что делать когда ничего не найдено
 // TODO: На макетах также когда есть поле поиска нет кнопки открыть на карте.
-export const YandexMap = JSX<YandexMapProps>(({ points, className = '', zoom = 5 }) => {
+export const YandexMap = JSX<YandexMapProps>(({ points, className = '', zoom = 5, isLoad }) => {
   const map = useRef<ymaps.Map | null>(null);
 
   const yandexMaps = useYandexMaps();
 
   useEffect(() => {
-    if (!points?.length) {
-      return;
-    }
+    if (map.current) {
+      renderClusterer({ yandexMaps, map: map.current, points, isLoad });
 
-    if (!map?.current) {
+      map.current.setCenter(getCenterPoint(points));
+    } else {
       yandexMaps?.ready(() => {
         // Ready function may be called few times, but must be called once
         if (map.current) {
+          renderClusterer({ yandexMaps, map: map.current, points, isLoad });
+
           return;
         }
 
@@ -46,14 +50,10 @@ export const YandexMap = JSX<YandexMapProps>(({ points, className = '', zoom = 5
           suppressMapOpenBlock: true,
         });
 
-        renderClusterer({ yandexMaps, map: map.current, points });
+        renderClusterer({ yandexMaps, map: map.current, points, isLoad });
       });
-    } else if (yandexMaps) {
-      renderClusterer({ yandexMaps, map: map.current, points });
-
-      map.current.setCenter(getCenterPoint(points));
     }
-  }, [yandexMaps, points, zoom]);
+  }, [yandexMaps, points, zoom, isLoad]);
 
   if (!yandexMaps) {
     return null;
@@ -63,6 +63,7 @@ export const YandexMap = JSX<YandexMapProps>(({ points, className = '', zoom = 5
 
   return (
     <div id="map" className={style('relative', 'w-full', className)}>
+      {isLoad ? <Loader /> : null}
       <div
         className={style(
           'absolute right-2 top-52 z-10 w-12 overflow-hidden border border-transparent rounded-md',
@@ -86,7 +87,7 @@ const getCenterPoint = (points?: BalloonPoints[]) => {
   return centerCoords.every((_) => _) ? centerCoords : DEFAULT_CENTER_COORDS;
 };
 
-const mapByIndex = (points: BalloonPoints[], index: number) => points.map((_) => _.coords[index]);
+const mapByIndex = (points: BalloonPoints[], index: number) => points.map((_) => _.coords?.[index]);
 
 const getArraySumAndAverage = (arr: number[]) =>
   arr.length && arr.reduce((a, b) => a + b) / arr.length;

package/mobile/src/ui-kit/YandexMap/renderClusterer.ts

@@ -11,11 +11,17 @@ export function renderClusterer({
   yandexMaps,
   map,
   points,
+  isLoad,
 }: {
   yandexMaps: typeof ymaps;
   map: ymaps.Map;
   points: BalloonPoints[];
+  isLoad: boolean;
 }) {
+  if (isLoad || !points?.length) {
+    return;
+  }
+
   map.geoObjects.removeAll();
 
   const clusterIconContentLayout = yandexMaps.templateLayoutFactory.createClass(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.521",
+  "version": "0.14.523",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/api/FileStorage.ts

@@ -1,4 +1,4 @@
-const API_BASE_URI = 'api/v1';
+const API_BASE_URI = '/api/v1';
 const WCMS_FILE_STORAGE_API_URI = '/wcms-file-storage';
 
 export type FileId = string;

package/src/components/OfficesAtmsMap/AtmsMap.tsx

@@ -25,27 +25,28 @@ const FILTRATION_PREDICATES = {
 };
 
 export interface AtmsMapProps {
-  data?: AtmsDef;
+  descriptionData?: AtmsDef;
   className?: string;
 }
 
-export const AtmsMap = JSX<AtmsMapProps>(({ data, className }) => {
+export const AtmsMap = JSX<AtmsMapProps>(({ descriptionData, className }) => {
   const [currentLocation] = useLocation();
 
   const regionCode = currentLocation?.code ?? '000';
 
-  const officesData = useAtms(regionCode);
+  const { data: officesData, isLoad } = useAtms(regionCode);
 
   return (
     <OfficesAtmsMapLayout
       className={className}
       filterItems={filterItems}
       data={officesData}
+      isLoad={isLoad}
       initFilterState={INITIAL_FILTRATION_STATE}
       renderCard={renderAtmCard}
       getBalloon={getAtmPoint}
       title={`Банкоматы филиала ${currentLocation?.name}`}
-      descriptionData={data}
+      descriptionData={descriptionData}
     />
   );
 });

package/src/components/OfficesAtmsMap/OfficesAtmsMap.tsx

@@ -13,7 +13,7 @@ export const OfficesAtmsMap = JSX<OfficesAtmsMapProps>(({ data, className, ...re
 
   return (
     <BlockWrapper version="transparent" className={style(className)} defaultPadding="p-0" {...rest}>
-      {dataType === 'offices' ? <OfficesMap /> : <AtmsMap data={data as AtmsDef} />}
+      {dataType === 'offices' ? <OfficesMap /> : <AtmsMap descriptionData={data as AtmsDef} />}
     </BlockWrapper>
   );
 });

package/src/components/OfficesAtmsMap/OfficesAtmsMapLayout.tsx

@@ -5,7 +5,6 @@ import { type VNode } from '../../model/VNode';
 import { Button } from '../../ui-kit/Button/Button';
 import { ClientOnly } from '../../ui-kit/ClientOnly';
 import { Heading } from '../../ui-kit/Heading/Heading';
-import { Loader } from '../../ui-kit/Loader/Loader';
 import { Text } from '../../ui-kit/Text/Text';
 import { YandexMap } from '../../ui-kit/YandexMap/YandexMap';
 import { getVersion } from '../../utils/getVersion';
@@ -24,6 +23,7 @@ export type InitFilterState = Record<string, boolean>;
 export interface OfficesAtmsMapLayoutProps<T> {
   className?: string;
   data?: T[];
+  isLoad: boolean;
   remoteWorkplaces?: T[];
   renderCard?: (item: T, index: number) => VNode;
   renderRemoteWorkplaceCard?: (item: T, index: number) => VNode;
@@ -42,6 +42,7 @@ export const OfficesAtmsMapLayout = JSX<OfficesAtmsMapLayoutProps<Branch | Atm |
   ({
     className,
     data = [],
+    isLoad,
     remoteWorkplaces = [],
     renderCard = defaultEmptyFunction,
     renderRemoteWorkplaceCard = defaultEmptyFunction,
@@ -53,7 +54,6 @@ export const OfficesAtmsMapLayout = JSX<OfficesAtmsMapLayoutProps<Branch | Atm |
     title,
   }) => {
     const onlyOffice = title?.includes('Офис');
-
     const [filtrationState, { field, reset }] = useForm(initFilterState);
 
     const [filteredItems, points, filteredRemoteWorkplaces, lengthItems] = useMemo(() => {
@@ -87,16 +87,7 @@ export const OfficesAtmsMapLayout = JSX<OfficesAtmsMapLayoutProps<Branch | Atm |
       <div className={style('space-y-1', className)}>
         <div className="bg-white">
           <div className="p-3xl pb-0">
-            <div className="flex flex-col sm:flex-row gap-xs mb-2xl">
-              <Heading headingType="h3">
-                <span suppressHydrationWarning={true}>{title}</span>
-                {lengthItems ? (
-                  <Text size="text-h2" color="text-secondary-text">
-                    <span suppressHydrationWarning={true}>{` (${lengthItems})`}</span>
-                  </Text>
-                ) : null}
-              </Heading>
-            </div>
+            {renderHeading(title, lengthItems)}
             {descriptionData ? renderDescriptionBlock(descriptionData) : null}
             {onlyOffice && renderButtonsGroup(data, activeButton, setActiveButton)}
             <div className={style('pb-3xl', filtersVisibleStyles(activeButton))}>
@@ -105,7 +96,7 @@ export const OfficesAtmsMapLayout = JSX<OfficesAtmsMapLayoutProps<Branch | Atm |
           </div>
           <div className="h-[600px]">
             <ClientOnly>
-              {points?.length ? <YandexMap points={points} className="h-full" /> : <Loader />}
+              <YandexMap points={points} isLoad={isLoad} className="h-full" />
             </ClientOnly>
           </div>
         </div>
@@ -118,6 +109,19 @@ export const OfficesAtmsMapLayout = JSX<OfficesAtmsMapLayoutProps<Branch | Atm |
   },
 );
 
+const renderHeading = (title?: string, lengthItems?: number) => (
+  <div className="flex flex-col sm:flex-row gap-xs mb-2xl">
+    <Heading headingType="h3">
+      <span suppressHydrationWarning={true}>{title}</span>
+      {lengthItems ? (
+        <Text size="text-h2" color="text-secondary-text">
+          <span suppressHydrationWarning={true}>{` (${lengthItems})`}</span>
+        </Text>
+      ) : null}
+    </Heading>
+  </div>
+);
+
 const renderButtonsGroup = (
   data: Branch[],
   activeButton: string,