@redneckz/wildless-cms-uni-blocks 0.14.136 → 0.14.138

package/src/components/Footer/Footer.mobile.tsx

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { useSWRResource } from '../../hooks/useSWRResource';
 import { type LinkProps } from '../../model/LinkProps';
 import { projectSettings } from '../../ProjectSettings';
@@ -7,9 +8,10 @@ import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { LinkButton } from '../../ui-kit/LinkButton/LinkButton';
 import { Text } from '../../ui-kit/Text/Text';
 import { appendSlash } from '../../utils/appendSlash';
-import { deleteAllCookies } from '../../utils/deleteAllCookie';
+import { mapCookie } from '../../utils/mapCookie';
 import { RollupItem } from '../RollupItem/RollupItem';
 import { Contacts } from './Contacts';
+import { COOKIE_REPLACE } from './cookieReplaceData';
 import { findIconByHref } from './findIconByHref';
 import { type FooterDataProps } from './FooterDataProps';
 import { type FooterProps } from './FooterProps';
@@ -31,6 +33,11 @@ export const Footer = JSX<FooterProps>(({ className, ...rest }) => {
     documents,
   } = useSWRResource<FooterDataProps>(projectSettings.FOOTER || 'footer', { fallback });
 
+  const handleOnClick = useCallback(() => {
+    const [name, oldValue, newValue] = COOKIE_REPLACE;
+    mapCookie(name, (value) => value?.replace(oldValue, newValue));
+  }, []);
+
   return (
     <BlockWrapper tag="footer" className={className} defaultPadding="p-4xl pb-24" {...rest}>
       <div className="mb-lg pb-xs border-b border-main-divider">
@@ -62,7 +69,7 @@ export const Footer = JSX<FooterProps>(({ className, ...rest }) => {
           text="Вернуться на прежнюю версию сайта"
           className="text-l font-light max-w-[292px]"
           href="https://old.rshb.ru"
-          onClick={deleteAllCookies}
+          onClick={handleOnClick}
         />
       </div>
       <HorizontalNavigation

package/src/components/Footer/Footer.tsx

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { useSWRResource } from '../../hooks/useSWRResource';
 import { projectSettings } from '../../ProjectSettings';
 import { useSitemap } from '../../services/sitemap/useSitemap';
@@ -7,9 +8,10 @@ import { LinkButton } from '../../ui-kit/LinkButton/LinkButton';
 import { Logo } from '../../ui-kit/Logo/Logo';
 import { SearchBar } from '../../ui-kit/SearchBar/SearchBar';
 import { Sitemap } from '../../ui-kit/Sitemap/Sitemap';
-import { deleteAllCookies } from '../../utils/deleteAllCookie';
+import { mapCookie } from '../../utils/mapCookie';
 import { style } from '../../utils/style';
 import { Contacts } from './Contacts';
+import { COOKIE_REPLACE } from './cookieReplaceData';
 import { type FooterDataProps } from './FooterDataProps';
 import { type FooterProps } from './FooterProps';
 import { HorizontalNavigation } from './HorizontalNavigation';
@@ -25,6 +27,11 @@ export const Footer = JSX<FooterProps>(({ className, ...rest }) => {
       fallback: rest.options?.page?.fallback,
     });
 
+  const handleOnClick = useCallback(() => {
+    const [name, oldValue, newValue] = COOKIE_REPLACE;
+    mapCookie(name, (value) => value?.replace(oldValue, newValue));
+  }, []);
+
   return (
     <BlockWrapper tag="footer" className={className} {...rest}>
       <div className="flex items-stretch gap-3xl pb-3xl ">
@@ -42,7 +49,7 @@ export const Footer = JSX<FooterProps>(({ className, ...rest }) => {
             version="link"
             href="https://old.rshb.ru"
             className="!text-left text-s font-light"
-            onClick={deleteAllCookies}
+            onClick={handleOnClick}
           >
             Вернуться на прежнюю версию сайта
           </LinkButton>

package/src/components/Footer/cookieReplaceData.ts

@@ -0,0 +1 @@
+export const COOKIE_REPLACE = ['split_version', 'New', 'Old'];

package/src/components/OfficesAtmsMap/OfficesAtmsMapLayout.tsx

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm';
 import { type VNode } from '../../model/VNode';
 import { ClientOnly } from '../../ui-kit/ClientOnly';
@@ -39,13 +40,15 @@ export const OfficesAtmsMapLayout = JSX<OfficesAtmsMapLayoutProps<Branch | Atm>>
   }) => {
     const [filtrationState, { field, reset }] = useForm(initFilterState);
 
-    const filteredItems = filterItems(data, filtrationState);
+    const [filteredItems, points, lengthItems] = useMemo(() => {
+      const _filteredItems = filterItems(data, filtrationState);
 
-    const points = filteredItems
-      .map((_) => [_.gpsLatitude, _.gpsLongitude].filter(Boolean) as number[])
-      .filter((_) => _ && _.length === 2);
+      const _points = _filteredItems
+        .map((_) => [_.gpsLatitude, _.gpsLongitude].filter(Boolean) as number[])
+        .filter((_) => _ && _.length === 2);
 
-    const lengthItems = filteredItems.length;
+      return [_filteredItems, _points, _filteredItems.length];
+    }, [data, filtrationState]);
 
     return (
       <div className={style('space-y-1', className)}>

package/src/components/VerticalLayout/VerticalLayout.example.json

@@ -9,6 +9,16 @@
   "style": ["col-span-12"],
   "type": "VerticalLayout",
   "blocks": [
+    {
+      "content": {
+        "title": "Заголовок",
+        "description": "Описание",
+        "align": "text-center",
+        "headlineVersion": "M"
+      },
+      "style": ["col-span-12"],
+      "type": "Headline"
+    },
     {
       "content": {
         "isBlur": false,

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

@@ -40,8 +40,6 @@ export const YandexMap = JSX<YandexMapProps>(({ points, className = '', zoom = 5
 
   const [isFullScreen, setIsFullScreen] = useState();
 
-  const pointsCenter = points ? getCenterPoint(points) : DEFAULT_CENTER_COORDS;
-
   useEffect(() => {
     if (!map?.current) {
       yandexMaps?.ready(() => {
@@ -51,7 +49,7 @@ export const YandexMap = JSX<YandexMapProps>(({ points, className = '', zoom = 5
         }
 
         map.current = new yandexMaps.Map('map', {
-          center: pointsCenter,
+          center: points ? getCenterPoint(points) : DEFAULT_CENTER_COORDS,
           zoom,
           controls: [],
           suppressMapOpenBlock: true,
@@ -59,16 +57,14 @@ export const YandexMap = JSX<YandexMapProps>(({ points, className = '', zoom = 5
 
         renderClusterer(yandexMaps, map.current, points);
       });
-    }
-
-    if (map.current && yandexMaps) {
+    } else if (yandexMaps) {
       renderClusterer(yandexMaps, map.current, points);
 
       if (!points?.length) {
         map.current.setCenter(DEFAULT_CENTER_COORDS);
       }
     }
-  }, [yandexMaps, map, points, pointsCenter, zoom]);
+  }, [yandexMaps, map, points, zoom]);
 
   if (!yandexMaps) {
     return null;

package/src/utils/isUUID.ts

@@ -1,3 +1,5 @@
 export const isUUID = (src: string) => {
-  return /^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89aAbB][a-f0-9]{3}-[a-f0-9]{12}$/.test(src);
+  return /^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89aAbB][a-f0-9]{3}-[a-f0-9]{12}(\/revs\/[0-9]{1,20})?$/.test(
+    src,
+  );
 };

package/src/utils/mapCookie.ts

@@ -0,0 +1,11 @@
+export const mapCookie = (
+  name: string,
+  mapper: (value: string | undefined) => string | undefined,
+) => {
+  const cookies = globalThis.document?.cookie.split(';') ?? [];
+  const [, value] = cookies.map((_) => _.split('=')).find(([key]) => key.trim() === name) || [];
+
+  if (mapper(value)) {
+    globalThis.document.cookie = `${name}=${mapper(value)}`;
+  }
+};

package/bundle/utils/deleteAllCookie.d.ts

@@ -1 +0,0 @@
-export declare const deleteAllCookies: () => void;

package/dist/utils/deleteAllCookie.d.ts

@@ -1 +0,0 @@
-export declare const deleteAllCookies: () => void;

package/dist/utils/deleteAllCookie.js

@@ -1,11 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteAllCookies = void 0;
-const deleteAllCookies = () => {
-    const cookies = globalThis.document?.cookie.split(';') ?? [];
-    for (const cookie of cookies) {
-        const [name] = cookie.split('=');
-        globalThis.document.cookie = `${name}=;expires=Thu, 01 Jan 1970 00:00:00 GMT;path=/`;
-    }
-};
-exports.deleteAllCookies = deleteAllCookies;
-//# sourceMappingURL=deleteAllCookie.js.map

package/dist/utils/deleteAllCookie.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"deleteAllCookie.js","sourceRoot":"","sources":["../../src/utils/deleteAllCookie.ts"],"names":[],"mappings":";;AAAO,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IAE7D,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACjC,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,GAAG,IAAI,gDAAgD,CAAC;KACtF;AACH,CAAC,CAAC;AAPW,QAAA,gBAAgB,oBAO3B"}

package/lib/utils/deleteAllCookie.d.ts

@@ -1 +0,0 @@
-export declare const deleteAllCookies: () => void;

package/lib/utils/deleteAllCookie.js

@@ -1,8 +0,0 @@
-export const deleteAllCookies = () => {
-    const cookies = globalThis.document?.cookie.split(';') ?? [];
-    for (const cookie of cookies) {
-        const [name] = cookie.split('=');
-        globalThis.document.cookie = `${name}=;expires=Thu, 01 Jan 1970 00:00:00 GMT;path=/`;
-    }
-};
-//# sourceMappingURL=deleteAllCookie.js.map

package/lib/utils/deleteAllCookie.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"deleteAllCookie.js","sourceRoot":"","sources":["../../src/utils/deleteAllCookie.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IAE7D,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACjC,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,GAAG,IAAI,gDAAgD,CAAC;KACtF;AACH,CAAC,CAAC"}

package/mobile/bundle/utils/deleteAllCookie.d.ts

@@ -1 +0,0 @@
-export declare const deleteAllCookies: () => void;

package/mobile/dist/utils/deleteAllCookie.d.ts

@@ -1 +0,0 @@
-export declare const deleteAllCookies: () => void;

package/mobile/dist/utils/deleteAllCookie.js

@@ -1,11 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteAllCookies = void 0;
-const deleteAllCookies = () => {
-    const cookies = globalThis.document?.cookie.split(';') ?? [];
-    for (const cookie of cookies) {
-        const [name] = cookie.split('=');
-        globalThis.document.cookie = `${name}=;expires=Thu, 01 Jan 1970 00:00:00 GMT;path=/`;
-    }
-};
-exports.deleteAllCookies = deleteAllCookies;
-//# sourceMappingURL=deleteAllCookie.js.map

package/mobile/dist/utils/deleteAllCookie.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"deleteAllCookie.js","sourceRoot":"","sources":["../../src/utils/deleteAllCookie.ts"],"names":[],"mappings":";;AAAO,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IAE7D,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACjC,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,GAAG,IAAI,gDAAgD,CAAC;KACtF;AACH,CAAC,CAAC;AAPW,QAAA,gBAAgB,oBAO3B"}

package/mobile/lib/utils/deleteAllCookie.d.ts

@@ -1 +0,0 @@
-export declare const deleteAllCookies: () => void;

package/mobile/lib/utils/deleteAllCookie.js

@@ -1,8 +0,0 @@
-export const deleteAllCookies = () => {
-    const cookies = globalThis.document?.cookie.split(';') ?? [];
-    for (const cookie of cookies) {
-        const [name] = cookie.split('=');
-        globalThis.document.cookie = `${name}=;expires=Thu, 01 Jan 1970 00:00:00 GMT;path=/`;
-    }
-};
-//# sourceMappingURL=deleteAllCookie.js.map

package/mobile/lib/utils/deleteAllCookie.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"deleteAllCookie.js","sourceRoot":"","sources":["../../src/utils/deleteAllCookie.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IAE7D,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACjC,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,GAAG,IAAI,gDAAgD,CAAC;KACtF;AACH,CAAC,CAAC"}

package/mobile/src/utils/deleteAllCookie.ts

@@ -1,8 +0,0 @@
-export const deleteAllCookies = () => {
-  const cookies = globalThis.document?.cookie.split(';') ?? [];
-
-  for (const cookie of cookies) {
-    const [name] = cookie.split('=');
-    globalThis.document.cookie = `${name}=;expires=Thu, 01 Jan 1970 00:00:00 GMT;path=/`;
-  }
-};

package/src/utils/deleteAllCookie.ts

@@ -1,8 +0,0 @@
-export const deleteAllCookies = () => {
-  const cookies = globalThis.document?.cookie.split(';') ?? [];
-
-  for (const cookie of cookies) {
-    const [name] = cookie.split('=');
-    globalThis.document.cookie = `${name}=;expires=Thu, 01 Jan 1970 00:00:00 GMT;path=/`;
-  }
-};