@redneckz/wildless-cms-uni-blocks 0.6.41 → 0.6.42

package/src/components/Header/HeaderSecondaryMenu.tsx

@@ -1,8 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useGeolocation } from '../../hooks/useGeolocation';
+import { useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useLocation } from '../../hooks/useLocation';
 import type { BgColorVersion } from '../../model/BgColorVersion';
 import type { IconVersion } from '../../model/IconVersion';
+import type { ForeignOffice } from '../../services/sitemap/SitemapProps';
 import { Img } from '../../ui-kit/Img/Img';
+import { Location } from '../../ui-kit/Location/Location';
 import { TopItem } from '../../ui-kit/TopItem/TopItem';
 import { HeaderSecondaryMenuButton } from './HeaderSecondaryMenuButton';
 
@@ -10,6 +13,7 @@ interface HeaderSecondaryMenuContent {
   defaultLocation?: string;
   officesLink?: string;
   bgColor?: BgColorVersion;
+  foreignOffices?: ForeignOffice[];
 }
 
 export interface HeaderSecondaryMenuProps extends HeaderSecondaryMenuContent {
@@ -30,8 +34,23 @@ const LINKS_ICON_VERSION_MAP: Record<BgColorVersion, IconVersion> = {
 };
 
 export const HeaderSecondaryMenu = JSX<HeaderSecondaryMenuProps>(
-  ({ className, officesLink, defaultLocation = 'Москва', bgColor = 'bg-white' }) => {
-    const [city, getCity] = useGeolocation(defaultLocation);
+  ({
+    className,
+    officesLink,
+    defaultLocation = 'Москва',
+    foreignOffices,
+    bgColor = 'bg-white',
+  }) => {
+    const [isShowLocationModal, setShowLocationModal] = useState<boolean>(false);
+
+    const [location, onChangeLocation] = useLocation(defaultLocation);
+
+    const showLocationModal = () => {
+      setShowLocationModal(true);
+    };
+    const hideLocationModal = () => {
+      setShowLocationModal(false);
+    };
 
     return (
       <div className={`flex items-center ${className || ''}`}>
@@ -39,9 +58,9 @@ export const HeaderSecondaryMenu = JSX<HeaderSecondaryMenuProps>(
           className="mr-5"
           flat={true}
           href="#"
-          text={city}
+          text={location.name}
           ariaLabel="Местоположение"
-          onClick={getCity}
+          onClick={showLocationModal}
           bgColor={bgColor}
         />
         {officesLink ? (
@@ -76,6 +95,14 @@ export const HeaderSecondaryMenu = JSX<HeaderSecondaryMenuProps>(
             asSVG
           />
         </HeaderSecondaryMenuButton>
+        {isShowLocationModal ? (
+          <Location
+            currentLocation={location}
+            foreignOffices={foreignOffices}
+            onChangeLocation={onChangeLocation}
+            close={hideLocationModal}
+          />
+        ) : null}
       </div>
     );
   },

package/src/components/MiniGallery/MiniGallery.ui.json

@@ -8,7 +8,7 @@
         "button": {
           "icon": {
             "ui:field": "icon"
-          },
+          }, 
           "iconRight": {
             "ui:field": "icon"
           }

package/src/components/Recommendation/Recommendation.example.json

@@ -28,11 +28,12 @@
         },
         "title": "Заголовок 2",
         "description": "Описание 2",
-        "socialMedia": [
-          { "href": "https://t.me" },
-          { "href": "https://vk.com" },
-          { "href": "https://ok.ru" }
-        ]
+        "button": {
+          "href": "",
+          "text": "Подробнее",
+          "target": "_self",
+          "version": "primary"
+        }
       },
       {
         "image": {

package/src/components/Recommendation/Recommendation.fixture.tsx

@@ -1,9 +1,8 @@
+import '../../setup-fixture';
+import { Recommendation, RecommendationProps } from './Recommendation';
+import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import type { LinkProps } from '../../model/LinkProps';
 import type { Picture } from '../../model/Picture';
-import '../../setup-fixture';
-import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
-import type { RecommendationProps } from './Recommendation';
-import { Recommendation } from './Recommendation';
 
 const cowCard: Picture = {
   src: 'cow-card.png',
@@ -51,6 +50,13 @@ const socialMedia: LinkProps[] = [
   { href: 'https://ok.ru' },
 ];
 
+const button: ButtonWithIconProps = {
+  href: 'https://rshb.ru',
+  text: 'Подробнее',
+  target: '_blank',
+  version: 'secondary',
+};
+
 export const defaultProps: RecommendationProps = {
   title: 'Мы в социальных сетях',
   recommendations: [
@@ -76,6 +82,7 @@ export const defaultProps: RecommendationProps = {
       title: 'Кредитные карты',
       description: 'Льготный период 120 дней',
       image: productBasket,
+      button,
     },
     {
       title: 'Кредитные карты',
@@ -111,12 +118,6 @@ export const shortProps: RecommendationProps = {
   ],
 };
 
-const button: ButtonProps = {
-  text: 'Подробнее',
-  href: '/credit-cards',
-  version: 'secondary',
-};
-
 export const buttonProps: RecommendationProps = {
   title: 'Также интересуются',
   recommendations: [

package/src/components/Recommendation/Recommendation.ui.json

@@ -4,6 +4,14 @@
       "items": {
         "image": {
           "ui:field": "picture"
+        },
+        "button": {
+          "icon": {
+            "ui:field": "icon"
+          }, 
+          "iconRight": {
+            "ui:field": "icon"
+          }
         }
       }
     }

package/src/components/Recommendation/RecommendationCard.tsx

@@ -41,7 +41,7 @@ export const RecommendationCard = JSX<RecommendationCardProps>(
               <SocialMedia className="pt-10 pb-0" media={socialMedia} version={version} />
             ) : null}
             {button?.text ? (
-              <div className="pt-2">{renderButton({ button, buttonClassName: 'mt-16' })}</div>
+              <div className="pt-2">{renderButton({ button, buttonClassName: 'mt-16 px-5' })}</div>
             ) : null}
           </div>
         </BaseTile>

package/src/hooks/useCachedAsyncData.ts

@@ -0,0 +1,37 @@
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import type { AsyncDataResponse, Fetcher } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+
+const STORAGE_DEFAULT_TTL = 86400000; // 24 * 60 * 60 * 1000
+
+export function useCachedAsyncData<Data = any>(
+  key: string,
+  fetcher: Fetcher<Data, string>,
+  storage: any = globalThis?.localStorage,
+): AsyncDataResponse<Data> {
+  const cachedFetcher: typeof fetcher = useCallback(
+    async (...args) => {
+      const storageKey = `async:${key}`;
+      const storageData: string = storage.getItem(storageKey);
+
+      const cachedData = getParsedData(storageData);
+      if (cachedData) {
+        return cachedData;
+      }
+
+      const data = await fetcher(...args);
+      storage.setItem(storageKey, JSON.stringify({ data, timestamp: Date.now() }));
+
+      return data;
+    },
+    [key, fetcher],
+  );
+
+  return useAsyncData(key, cachedFetcher);
+}
+
+function getParsedData(storageData: string) {
+  const { data = null, timestamp = null } = storageData ? JSON.parse(storageData) : {};
+
+  return data && Date.now() - timestamp < STORAGE_DEFAULT_TTL ? data : undefined;
+}

package/src/hooks/useLocation.ts

@@ -0,0 +1,48 @@
+import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { fetchJSONUnsafe } from '../utils/fetchJSON';
+import { useCachedAsyncData } from './useCachedAsyncData';
+
+const REGION_URL = '/api/v1/region';
+
+export interface RegionData {
+  id?: number;
+  code?: string;
+  name?: string;
+}
+
+interface LocationStorageData {
+  manual?: boolean;
+  region: RegionData;
+}
+
+const localStorageLocation = globalThis?.localStorage.getItem('location');
+const currentLocation: LocationStorageData | null = localStorageLocation
+  ? JSON.parse(localStorageLocation)
+  : null;
+
+export function useLocation(
+  defaultLocation: string,
+): [RegionData, (newLocation: RegionData) => void] {
+  const [location, setLocation] = useState<RegionData>(
+    currentLocation?.region ?? { name: defaultLocation },
+  );
+  const { data } = useCachedAsyncData<RegionData>(REGION_URL, fetchJSONUnsafe);
+
+  useEffect(() => {
+    setLocation(
+      currentLocation?.region && currentLocation?.manual
+        ? currentLocation.region
+        : data || { name: defaultLocation },
+    );
+  }, [data]);
+
+  const onChangeLocation = useCallback(
+    (region: RegionData) => {
+      globalThis?.localStorage.setItem('location', JSON.stringify({ manual: true, region }));
+      setLocation(region);
+    },
+    [setLocation],
+  );
+
+  return [location, onChangeLocation];
+}

package/src/hooks/useRegions.ts

@@ -0,0 +1,16 @@
+import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { fetchJSONUnsafe } from '../utils/fetchJSON';
+
+const REGIONS_URL = '/api/v1/regions';
+
+export interface Region {
+  id?: number;
+  code?: string;
+  name?: string;
+}
+
+export function useRegions(): Region[] {
+  const { data } = useAsyncData<Region[]>(REGIONS_URL, fetchJSONUnsafe);
+
+  return data || [];
+}

package/src/services/sitemap/SitemapProps.ts

@@ -20,10 +20,19 @@ export interface DispositionItem extends LinkProps {
   icon?: Picture;
 }
 
+/**
+ * @title Представительства за рубежом
+ * @required ["text", "href"]
+ */
+export interface ForeignOffice extends LinkProps {
+  icon?: Picture;
+}
+
 export interface SitemapDataProps {
   topItems?: TopMenuItem[];
   dispositions?: DispositionItem[];
   logo?: LogoType;
+  foreignOffices?: ForeignOffice[];
   defaultLocation?: string;
   officesLink?: string;
 }

package/src/ui-kit/Location/Location.fixture.tsx

@@ -0,0 +1,81 @@
+import { Picture } from '../../model/Picture';
+import type { ForeignOffice } from '../../services/sitemap/SitemapProps';
+import '../../setup-fixture';
+import { Location } from './Location';
+
+const belarus: Picture = {
+  src: 'belarus.png',
+  format: 'webp',
+  size: {
+    width: 24,
+    height: 24,
+  },
+};
+
+const kazakhstan: Picture = {
+  src: 'kazakhstan.png',
+  format: 'webp',
+  size: {
+    width: 24,
+    height: 24,
+  },
+};
+
+const armenia: Picture = {
+  src: 'armenia.png',
+  format: 'webp',
+  size: {
+    width: 24,
+    height: 24,
+  },
+};
+
+const china: Picture = {
+  src: 'china.png',
+  format: 'webp',
+  size: {
+    width: 24,
+    height: 24,
+  },
+};
+
+const FOREIGN_OFFICES: ForeignOffice[] = [
+  {
+    text: 'Республика Беларусь',
+    href: '#',
+    icon: belarus,
+  },
+  {
+    text: 'Республика Казахстан',
+    href: '#',
+    icon: kazakhstan,
+  },
+  {
+    text: 'Республика Армения',
+    href: '#',
+    icon: armenia,
+  },
+  {
+    text: 'Китайская Народная Республика',
+    href: '#',
+    icon: china,
+  },
+];
+
+const close = () => ({});
+const onChangeLocation = () => ({});
+
+const currentLocation = {
+  name: 'Москва',
+};
+
+export default {
+  default: (
+    <Location
+      close={close}
+      onChangeLocation={onChangeLocation}
+      currentLocation={currentLocation}
+      foreignOffices={FOREIGN_OFFICES}
+    />
+  ),
+};

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

@@ -0,0 +1,168 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useLink } from '../../hooks/useLink';
+import type { Region } from '../../hooks/useRegions';
+import { useRegions } from '../../hooks/useRegions';
+import { useSearch } from '../../hooks/useSearch';
+import type { UniBlockProps } from '../../model/JSXBlock';
+import type { ForeignOffice } from '../../services/sitemap/SitemapProps';
+import { Text } from '../../ui-kit/Text/Text';
+import { groupBy } from '../../utils/groupBy';
+import { Img } from '../Img/Img';
+import { SearchBar } from './SearchBar';
+
+const SEARCH_TERM_MIN_LENGTH = 3;
+
+interface RegionLinkProps {
+  onChangeLocation?: (region: Region) => void;
+}
+
+interface CloseButtonProps {
+  close?: () => void;
+}
+
+interface CurrentLocationProps {
+  currentLocation?: Region;
+}
+
+interface ForeignOfficeProps {
+  foreignOffices?: ForeignOffice[];
+}
+
+export type LocationProps = ForeignOfficeProps &
+  CloseButtonProps &
+  RegionLinkProps &
+  CurrentLocationProps &
+  UniBlockProps;
+
+export const Location = JSX<LocationProps>(
+  ({ currentLocation, onChangeLocation, close, foreignOffices }) => {
+    const { term, setTerm } = useSearch();
+
+    const handleSearch = useCallback((_: string) => setTerm(_), []);
+
+    const regions: Region[] = cleanUpRegions(useRegions()).sort((a, b) =>
+      a.name.localeCompare(b.name),
+    );
+    const regionsGroupByLetter: Map<string, Region[]> = groupBy(regions, regionFirstLetter);
+
+    return (
+      <div className="absolute h-full w-full inset-0 bg-white text-l-light z-50">
+        <CloseButton close={close} />
+        <div className="container py-12">
+          <CurrentLocation currentLocation={currentLocation} />
+          <SearchBar onSearch={handleSearch} searchTerm={term} className="mb-7" />
+
+          {term && term.length >= SEARCH_TERM_MIN_LENGTH ? (
+            <div>
+              {regions
+                .filter((region) => region.name?.startsWith(term))
+                .map(renderRegion({ onChangeLocation, close }))}
+            </div>
+          ) : (
+            <div className="columns-5">
+              {Array.from(regionsGroupByLetter.entries()).map(
+                renderRegionGroup({ onChangeLocation, close }),
+              )}
+            </div>
+          )}
+
+          <ForeignOffices foreignOffices={foreignOffices} />
+        </div>
+      </div>
+    );
+  },
+);
+
+const regionFirstLetter = (region: Region) => region.name?.charAt(0) || '';
+
+const cleanUpRegions = (regions: Region[]) =>
+  regions.map((region) => ({
+    ...region,
+    name: region.name?.replace(/республика|область|край'/gi, '').trim() || '',
+  }));
+
+const CurrentLocation = JSX<CurrentLocationProps>(({ currentLocation }) =>
+  currentLocation ? (
+    <div className="mb-4">
+      <Text size="text-l" font="font-light">
+        Сейчас выбран:&nbsp;
+      </Text>
+      <button className="cursor-pointer" onClick={close}>
+        <Text color="text-green">{currentLocation.name}</Text>
+      </button>
+    </div>
+  ) : null,
+);
+
+const CloseButton = JSX<CloseButtonProps>(({ close }) => (
+  <button
+    className="visible peer-placeholder-shown:invisible absolute top-6 right-6 w-6 h-6 p-1 bg-transparent cursor-pointer border-none"
+    onClick={(e) => {
+      e.preventDefault();
+      close && close();
+    }}
+  >
+    <Img image="CloseIcon" width="24" height="24" />
+  </button>
+));
+
+const renderRegionGroup =
+  ({ onChangeLocation, close }: RegionLinkProps & CloseButtonProps) =>
+  ([letter, regions]: [string, Region[]]) =>
+    (
+      <div key={letter} className="break-inside-avoid mb-7 w-[224px]">
+        <div className="mb-2.5">
+          <Text size="text-h6">{letter}</Text>
+        </div>
+        {regions.map(renderRegion({ onChangeLocation, close }))}
+      </div>
+    );
+
+const renderRegion =
+  ({ onChangeLocation, close }: RegionLinkProps & CloseButtonProps) =>
+  (region: Region) =>
+    (
+      <div key={region.id} className="mb-1">
+        <button
+          className="cursor-pointer hover:text-primary-hover"
+          onClick={() => {
+            onChangeLocation && onChangeLocation(region);
+            close && close();
+          }}
+        >
+          {region.name}
+        </button>
+      </div>
+    );
+
+const ForeignOffices = JSX<ForeignOfficeProps>(({ foreignOffices }) =>
+  foreignOffices?.length ? (
+    <div className="border-t border-main-divider mt-7 pt-7">
+      <div className="mb-4">
+        <Text size="text-m-light" color="text-secondary-text">
+          Представительства за рубежом:
+        </Text>
+      </div>
+      <div className="flex gap-10">
+        {foreignOffices.map((office, i: number) => (
+          <ForeignOffice key={String(i)} {...office} />
+        ))}
+      </div>
+    </div>
+  ) : null,
+);
+
+const ForeignOffice = JSX<ForeignOffice>(({ icon, ...rest }) => {
+  const link = useLink();
+  const { text, target, href, onClick } = link(rest);
+
+  return (
+    <div className="flex gap-x-3">
+      <Img image={icon} />
+      <a className="hover:text-primary-hover" href={href} target={target} onClick={onClick}>
+        {text}
+      </a>
+    </div>
+  );
+});

package/src/ui-kit/Location/SearchBar.tsx

@@ -0,0 +1,30 @@
+import { JSX } from '@redneckz/uni-jsx';
+
+export interface SearchBarInnerProps {
+  className?: string;
+  searchTerm?: string;
+  onSearch: (_: string) => void;
+}
+
+export const SearchBar = JSX<SearchBarInnerProps>(({ className, searchTerm, onSearch }) => {
+  return (
+    <form className={`font-sans relative ${className}`}>
+      <div className="absolute rounded h-full flex items-center justify-center pl-4 max-w-[170px] gap-3.5 pointer-events-none">
+        {searchTerm ? null : (
+          <label htmlFor="search-bar-input" className={`text-secondary-text `}>
+            Поиск по филиалам
+          </label>
+        )}
+      </div>
+      <input
+        id="search-bar-input"
+        className={`h-12 pl-4 w-full peer text-l text-black border border-solid rounded-md box-border
+              outline-none border-main-stroke hover:border-primary-hover active:border-primary-text focus:border-primary-text`}
+        value={searchTerm}
+        onChange={(e) => onSearch(e.target.value as string)}
+        type="text"
+        name="location-search-bar-input"
+      />
+    </form>
+  );
+});

package/src/ui-kit/SwipeListControl/SwipeListContainer.tsx

@@ -29,7 +29,7 @@ export const SwipeListContainer = JSX<SwipeListContainerProps>(
     className = '',
     containerRef,
     activeIndex,
-    visibleItemCount,
+    visibleItemCount = 0,
     gap = 0,
     padding = 0,
     snapAlign = 'snap-center',
@@ -54,11 +54,15 @@ export const SwipeListContainer = JSX<SwipeListContainerProps>(
       },
       [onVisibleItemsChange, onVisibleIndicesChange],
     );
+    const additionPadding = visibleItemCount > 0 ? gap * Number(visibleItemCount) - 1 : 0;
 
     return (
       <div
         className={`box-border overflow-auto flex horizontal-list no-scrollbar ${className}`}
-        style={{ ...getContainerStyle(padding), gap: `${gap}px` }}
+        style={{
+          ...getContainerStyle(padding, additionPadding),
+          gap: `${gap}px`,
+        }}
         role="list"
         ref={containerRef}
       >
@@ -83,11 +87,11 @@ export const SwipeListContainer = JSX<SwipeListContainerProps>(
 );
 
 // Styles used to compensate outer container padding to get rid of clipping effect
-const getContainerStyle = (padding: number): Record<string, string> => ({
+const getContainerStyle = (padding: number, additionalPadding = 0): Record<string, string> => ({
   marginLeft: `${-padding}px`,
   marginRight: `${-padding}px`,
   paddingLeft: `${padding}px`,
-  paddingRight: `${padding}px`,
+  paddingRight: `${padding + additionalPadding}px`,
 });
 
 const getVisibleIndices = (itemsVisibilityList: ItemsVisibilityList) =>

package/src/utils/groupBy.ts

@@ -0,0 +1,10 @@
+export const groupBy = <K, V>(list: Array<V>, keyGetter: (input: V) => K): Map<K, Array<V>> => {
+  const map = new Map<K, Array<V>>();
+  list.forEach((item) => {
+    const key = keyGetter(item);
+    const collection = map.get(key);
+    map.set(key, [...(collection || []), item]);
+  });
+
+  return map;
+};

package/bundle/hooks/useGeolocation.d.ts

@@ -1 +0,0 @@
-export declare function useGeolocation(defaultLocation: string): [string, () => void];

package/dist/hooks/useGeolocation.d.ts

@@ -1 +0,0 @@
-export declare function useGeolocation(defaultLocation: string): [string, () => void];

package/dist/hooks/useGeolocation.js

@@ -1,21 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useGeolocation = void 0;
-const hooks_1 = require("@redneckz/uni-jsx/lib/hooks");
-const DaDataAPI_1 = require("../api/DaDataAPI");
-const DaData = (0, DaDataAPI_1.DaDataAPI)('https://10.80.4.9');
-function useGeolocation(defaultLocation) {
-    const [city, setCity] = (0, hooks_1.useState)(defaultLocation);
-    (0, hooks_1.useEffect)(() => {
-        setCity(globalThis?.localStorage.getItem('location') || defaultLocation);
-    }, [defaultLocation]);
-    const getCity = (0, hooks_1.useCallback)(() => {
-        DaData.getFetcherAddress().then((_) => {
-            const location = _ || defaultLocation;
-            globalThis?.localStorage.setItem('location', location);
-            setCity(location);
-        });
-    }, [defaultLocation]);
-    return [city, getCity];
-}
-exports.useGeolocation = useGeolocation;
-//# sourceMappingURL=useGeolocation.js.map

package/dist/hooks/useGeolocation.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useGeolocation.js","sourceRoot":"","sources":["../../src/hooks/useGeolocation.ts"],"names":[],"mappings":";;AAAA,uDAA+E;AAC/E,gDAA6C;AAE7C,MAAM,MAAM,GAAG,IAAA,qBAAS,EAAC,mBAAmB,CAAC,CAAC;AAE9C,SAAgB,cAAc,CAAC,eAAuB;IACpD,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAA,gBAAQ,EAAC,eAAe,CAAC,CAAC;IAElD,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,OAAO,CAAC,UAAU,EAAE,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,eAAe,CAAC,CAAC;IAC3E,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;IAEtB,MAAM,OAAO,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QAC/B,MAAM,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;YACpC,MAAM,QAAQ,GAAG,CAAC,IAAI,eAAe,CAAC;YACtC,UAAU,EAAE,YAAY,CAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YACvD,OAAO,CAAC,QAAQ,CAAC,CAAC;QACpB,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;IAEtB,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACzB,CAAC;AAhBD,wCAgBC"}

package/lib/hooks/useGeolocation.d.ts

@@ -1 +0,0 @@
-export declare function useGeolocation(defaultLocation: string): [string, () => void];