@redneckz/wildless-cms-uni-blocks 0.14.515 → 0.14.517

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

@@ -28,6 +28,10 @@ export const YandexMap = JSX<YandexMapProps>(({ points, className = '', zoom = 5
   const yandexMaps = useYandexMaps();
 
   useEffect(() => {
+    if (!points?.length) {
+      return;
+    }
+
     if (!map?.current) {
       yandexMaps?.ready(() => {
         // Ready function may be called few times, but must be called once
@@ -36,7 +40,7 @@ export const YandexMap = JSX<YandexMapProps>(({ points, className = '', zoom = 5
         }
 
         map.current = new yandexMaps.Map('map', {
-          center: points ? getCenterPoint(points) : DEFAULT_CENTER_COORDS,
+          center: getCenterPoint(points),
           zoom,
           controls: [],
           suppressMapOpenBlock: true,
@@ -47,9 +51,7 @@ export const YandexMap = JSX<YandexMapProps>(({ points, className = '', zoom = 5
     } else if (yandexMaps) {
       renderClusterer({ yandexMaps, map: map.current, points });
 
-      if (!points?.length) {
-        map.current.setCenter(DEFAULT_CENTER_COORDS);
-      }
+      map.current.setCenter(getCenterPoint(points));
     }
   }, [yandexMaps, points, zoom]);
 
@@ -75,10 +77,14 @@ export const YandexMap = JSX<YandexMapProps>(({ points, className = '', zoom = 5
   );
 });
 
-const getCenterPoint = (points: BalloonPoints[]) => [
-  getArraySumAndAverage(mapByIndex(points, 0)),
-  getArraySumAndAverage(mapByIndex(points, 1)),
-];
+const getCenterPoint = (points?: BalloonPoints[]) => {
+  const centerCoords = [
+    getArraySumAndAverage(mapByIndex(points, 0)),
+    getArraySumAndAverage(mapByIndex(points, 1)),
+  ];
+
+  return centerCoords.every((_) => _) ? centerCoords : DEFAULT_CENTER_COORDS;
+};
 
 const mapByIndex = (points: BalloonPoints[], index: number) => points.map((_) => _.coords[index]);