@redneckz/wildless-cms-uni-blocks 0.10.9 → 0.11.0

package/src/components/VerticalLayout/VerticalLayout.fixture.mobile.tsx

@@ -1,15 +1,27 @@
+import '../../setup-fixture';
+
 import { BlockRendererOptions } from '../../BlockRenderer/BlockRendererOptions';
 import type { Picture } from '../../model/Picture';
-import '../../setup-fixture';
 import { Blocks } from '../Blocks';
 import { PRODUCT_TILE } from '../ProductTile/ProductTile.fixture';
+import { RICH_TEXT_SEPARATOR } from '../RichTextBlock/RichTextBlock.fixture';
 import type { TextBlockContent } from '../TextBlock/TextBlockContent';
-import { VerticalLayout } from '../VerticalLayout/VerticalLayout';
+import { VerticalLayout } from './VerticalLayout';
+import type { LinkDocsContent } from '../LinkDocs/LinkDocsContent';
 
 const options = {
   blocksRegistry: Blocks,
 } as BlockRendererOptions;
 
+const linkDocsExample: LinkDocsContent = {
+  description: 'Ответы на часто задаваемые вопросы',
+  documents: [
+    { text: 'target self', href: '/abc1/cooldoc.doc', target: '_self' },
+    { text: 'target blank', href: '/abc2/wtf.rtf', target: '_blank' },
+    { text: 'GlassIcon', href: '/abc3/map.jpeg' },
+  ],
+};
+
 const image: Picture = {
   src: 'bank-card.png',
   format: 'webp',
@@ -87,4 +99,61 @@ export default {
       />
     </div>
   ),
+  rollup: (
+    <div className="container grid grid-cols-12">
+      <VerticalLayout
+        align="left"
+        className="col-span-12"
+        version="primary"
+        isPadding={true}
+        block={{
+          type: 'VerticalLayout',
+          blocks: [
+            {
+              type: 'RollupItem',
+              content: {
+                label: 'Rollup button 1',
+              },
+              blocks: [
+                { type: 'TextBlock', content: TEXT_BLOCK },
+                { type: 'TextBlock', content: TEXT_BLOCK },
+              ],
+            },
+            {
+              type: 'RollupItem',
+              content: {
+                label: 'Rollup button 2',
+                isExpanded: true,
+              },
+              blocks: [{ type: 'LinkDocs', content: linkDocsExample }],
+            },
+            {
+              type: 'RollupItem',
+              content: {
+                label: 'Rollup button 2',
+                isExpanded: true,
+              },
+              blocks: [{ type: 'LinkDocs', content: linkDocsExample }],
+            },
+
+            {
+              type: 'RollupItem',
+              content: {
+                label: 'Rollup button 3 RichText',
+                labelIcon: { icon: 'BriefcaseIcon' },
+                isExpanded: true,
+              },
+              blocks: [
+                {
+                  type: 'RichTextBlock',
+                  content: RICH_TEXT_SEPARATOR,
+                },
+              ],
+            },
+          ],
+        }}
+        options={options}
+      />
+    </div>
+  ),
 };

package/src/components/VerticalLayout/VerticalLayout.fixture.tsx

@@ -1,5 +1,6 @@
-import type { BlockRendererOptions } from '../../BlockRenderer/BlockRendererOptions';
 import '../../setup-fixture';
+
+import type { BlockRendererOptions } from '../../BlockRenderer/BlockRendererOptions';
 import { Blocks } from '../Blocks';
 import { LinkDocsContent } from '../LinkDocs/LinkDocsContent';
 import { PRODUCT_TILE } from '../ProductTile/ProductTile.fixture';
@@ -7,7 +8,7 @@ import { RICH_TEXT_SEPARATOR } from '../RichTextBlock/RichTextBlock.fixture';
 import { TEXT_BLOCK } from '../TextBlock/TextBlock.fixture';
 import { VerticalLayout } from './VerticalLayout';
 
-export const linkDocsExample: LinkDocsContent = {
+const linkDocsExample: LinkDocsContent = {
   description: 'Ответы на часто задаваемые вопросы',
   documents: [
     { text: 'target self', href: '/abc1/cooldoc.doc', target: '_self' },

package/src/components/Video/Video.fixture.tsx

@@ -1,3 +1,5 @@
+import '../../setup-fixture';
+
 import { Video } from './Video';
 import { VideoContent } from './VideoContent';
 

package/src/content-page-repository/transformContentPage.ts

@@ -1,9 +1,12 @@
 import fs from 'fs';
+import path from 'path';
 import util from 'util';
 import type { ContentPageDef } from '../model/ContentPageDef';
+import { LinkProps } from '../model/LinkProps';
 import type { Picture } from '../model/Picture';
 import { mapJSON } from './mapJSON';
 import type { TransformationOptions } from './TransformationOptions';
+import { transformDocumentLink } from './transformDocumentLink';
 import { transformHTML } from './transformHTML';
 import { transformMarkdown } from './transformMarkdown';
 import { transformPicture } from './transformPicture';
@@ -13,6 +16,8 @@ const writeFile = util.promisify(fs.writeFile);
 
 const OUTPUT_SUFFIX = '.static';
 
+const DOCUMENT_EXT_LIST = ['.txt', '.doc', '.docx', '.xls', '.xlsx', '.ppt', '.pptx', '.pdf'];
+
 export async function transformContentPage(
   pagePath: string,
   options: TransformationOptions,
@@ -21,14 +26,13 @@ export async function transformContentPage(
 
   // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
   const result = await mapJSON<ContentPageDef>(JSON.parse(content), async (value: any, [key]) => {
-    const isMarkdown = isString(value) && key?.endsWith('__md');
-    const isHTML = isString(value) && key?.endsWith('__html');
-
     try {
-      if (isMarkdown) {
-        return await transformMarkdown(value);
-      } else if (isHTML) {
-        return await transformHTML(value);
+      if (isMarkdown(key, value)) {
+        return await transformMarkdown(value as string);
+      } else if (isHTML(key, value)) {
+        return await transformHTML(value as string);
+      } else if (isDocumentLink(value)) {
+        return await transformDocumentLink(value, pagePath, options);
       } else if (isPicture(value)) {
         return await transformPicture(value, pagePath, options);
       }
@@ -47,6 +51,14 @@ export async function transformContentPage(
 
 export const generatedPagePath = (pagePath: string) => `${pagePath}${OUTPUT_SUFFIX}`;
 
+const isMarkdown = (key: string, value: any): value is string =>
+  isString(value) && key?.endsWith('__md');
+const isHTML = (key: string, value: any): value is string =>
+  isString(value) && key?.endsWith('__html');
+const isDocumentLink = (_: any): _ is LinkProps =>
+  Boolean(_ && isLocalPath(_?.href) && isDocumentExt(path.extname(_?.href as string)));
+const isDocumentExt = (input: string) =>
+  DOCUMENT_EXT_LIST.some((ext) => input.toLowerCase().endsWith(ext));
 const isPicture = (_: any): _ is Picture => Boolean(_ && isLocalPath(_?.src));
 const isLocalPath = (_: any): boolean => isString(_) && _.length < 1024 && !isURL(_);
 const isURL = (src: string) => ['data:', 'https:', 'http:'].some((proto) => src.startsWith(proto));

package/src/content-page-repository/transformDocumentLink.ts

@@ -0,0 +1,37 @@
+import fs from 'fs';
+import path from 'path';
+import util from 'util';
+import type { LinkProps } from '../model/LinkProps';
+import type { TransformationOptions } from './TransformationOptions';
+
+const copyFile = util.promisify(fs.copyFile);
+
+export async function transformDocumentLink(
+  link: LinkProps,
+  pagePath: string,
+  options: TransformationOptions,
+): Promise<LinkProps> {
+  if (!link?.href) {
+    return link;
+  }
+
+  const { contentDir, publicDir } = options;
+  const input = path.join(path.dirname(pagePath), link.href);
+  const docRelativePath = path.relative(contentDir, input);
+  const output = path.join(publicDir, docRelativePath);
+
+  try {
+    await copyFile(input, output);
+  } catch (e) {
+    console.error(e);
+
+    return link;
+  }
+
+  const href = path.join('/', docRelativePath);
+
+  return {
+    ...link,
+    href,
+  };
+}

package/src/hooks/useForm.ts

@@ -1,15 +1,21 @@
 import { useCallback, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { ControlProps } from '../ui-kit/ControlProps';
 import type { PreventableEvent } from '../ui-kit/PreventableEvent';
+import { identity } from '../utils/identity';
 
-export interface FieldProps<V> {
-  value?: V;
+export interface FieldProps<V> extends ControlProps<V> {
   isDirty?: boolean;
-  onChange?: (value: V) => void;
 }
 
-export type FormFieldRegisterer<FormState> = <N extends keyof FormState>(
+type Options<In, Out> = {
+  parse?: (_: In) => Out;
+  format?: (_: Out) => In;
+};
+
+export type FormFieldRegisterer<FormState> = <N extends keyof FormState, V = FormState[N]>(
   fieldName: N,
-) => FieldProps<FormState[N]>;
+  options?: Options<V, FormState[N]>,
+) => FieldProps<V extends undefined ? FormState[N] : V>;
 
 export const useForm = <FormState extends Record<string, any>>(
   initialState: FormState,
@@ -33,18 +39,20 @@ export const useForm = <FormState extends Record<string, any>>(
   const handlersMap = useRef<Partial<Record<keyof FormState, (value: any) => void>>>({});
 
   const field: FormFieldRegisterer<FormState> = useCallback(
-    (fieldName) => {
+    (fieldName, options) => {
+      const { parse = identity, format = identity } = options || {};
+
       if (!handlersMap.current) {
         handlersMap.current = {};
       }
 
       handlersMap.current[fieldName] ||= (value) => {
-        setFormState((prev) => ({ ...prev, [fieldName]: value }));
+        setFormState((prev) => ({ ...prev, [fieldName]: parse(value) }));
         setDirtyFieldsMap((prev) => ({ ...prev, [fieldName]: true }));
       };
 
       return {
-        value: formState[fieldName],
+        value: format(formState[fieldName]) as any,
         isDirty: isDirtyForm || dirtyFieldsMap[fieldName],
         onChange: handlersMap.current[fieldName],
       };

package/src/hooks/useNormalizedInput.ts

@@ -0,0 +1,33 @@
+import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { InputProps } from '../ui-kit/Input/InputProps';
+
+interface UseNormalizedInputOptions<V, R> {
+  normalize: (v: V | undefined) => V;
+  format?: (v: V | undefined) => R;
+}
+
+export const useNormalizedInput = <V, P extends InputProps<V>, R = V>(
+  props: P,
+  { normalize, format }: UseNormalizedInputOptions<V, R>,
+) => {
+  const { value, onFocus, onBlur, onChange } = props;
+
+  const [isFocused, setIsFocused] = useState(false);
+
+  const handleFocus = useCallback((e) => {
+    setIsFocused(true);
+    onFocus && onFocus(e);
+  }, []);
+
+  const handleBlur = useCallback(() => {
+    setIsFocused(false);
+    onChange && onChange(normalize(value));
+    onBlur && onBlur();
+  }, [onChange, value]);
+
+  return {
+    value: (isFocused || !format ? value : format(value)) as R,
+    onFocus: handleFocus,
+    onBlur: handleBlur,
+  };
+};

package/src/hooks/useSWRResource.ts

@@ -2,10 +2,12 @@ import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import type { Fallback } from '../model/Fallback';
 import { fetchJSONUnsafe } from '../utils/fetchJSON';
 
+const EMPTY_VALUE = {};
+
 export function useSWRResource<Data>(filename: string, fallback: Fallback = {}): Data {
   const { data } = useAsyncData<Data>(`/wcms-resources/${filename}.json`, fetchJSONUnsafe, {
     fallback,
   });
 
-  return data || ({} as Data);
+  return data || (EMPTY_VALUE as Data);
 }

package/src/icons/ArrowDownSolidIcon.svg

@@ -0,0 +1 @@
+<svg title="Стрелка сплошная 'Вниз'" isInverse="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 25"><path fill="#C8CCD0" d="M6.293 9.457a1 1 0 0 1 1.414 0L12 13.75l4.293-4.293a1 1 0 1 1 1.414 1.414l-5 5a1 1 0 0 1-1.414 0l-5-5a1 1 0 0 1 0-1.414Z"/></svg>

package/src/icons/ArrowUpSolidIcon.svg

@@ -0,0 +1 @@
+<svg title="Стрелка сплошная 'Вверх'" isInverse="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 25"><path fill="#C8CCD0" d="M17.707 14.871a1 1 0 0 1-1.414 0L12 10.578l-4.293 4.293a1 1 0 0 1-1.414-1.414l5-5a1 1 0 0 1 1.414 0l5 5a1 1 0 0 1 0 1.414Z"/></svg>

package/src/icons/BagIcon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" title="Сумка" viewBox="0 0 24 25" fill="none"><path stroke="#1C1C1C" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2" d="m21.37 14.164.34-3.57c.26-2.44-.44-4.43-4.71-4.43H7c-4.27 0-4.97 1.99-4.7 4.43l.75 8c.21 1.96.93 3.57 4.95 3.57h8c4.02 0 4.74-1.61 4.95-3.57M8 6.164v-.8c0-1.77 0-3.2 3.2-3.2h1.6c3.2 0 3.2 1.43 3.2 3.2v.8"/><path stroke="#1C1C1C" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2" d="M14 13.164v1.02c0 1.09-.01 1.98-2 1.98-1.98 0-2-.88-2-1.97v-1.03c0-1 0-1 1-1h2c1 0 1 0 1 1Z"/><path stroke="#1C1C1C" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2" d="M21.65 11.164a16.484 16.484 0 0 1-7.65 3.02M2.62 11.438c2.25 1.54 4.79 2.47 7.38 2.76"/></svg>

package/src/icons/BriefcaseIcon.svg

@@ -0,0 +1,7 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.3708 14L21.7108 10.43C21.9708 7.99 21.2708 6 17.0008 6H7.0008C2.7308 6 2.0308 7.99 2.3008 10.43L3.0508 18.43C3.2608 20.39 3.9808 22 8.0008 22H16.0008C20.0208 22 20.7408 20.39 20.9508 18.43" stroke="#1C1C1C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 6V5.2C8 3.43 8 2 11.2 2H12.8C16 2 16 3.43 16 5.2V6" stroke="#1C1C1C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14 13V14C14 14.01 14 14.01 14 14.02C14 15.11 13.99 16 12 16C10.02 16 10 15.12 10 14.03V13C10 12 10 12 11 12H13C14 12 14 12 14 13Z" stroke="#1C1C1C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M21.65 11C19.34 12.68 16.7 13.68 14 14.02" stroke="#1C1C1C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.61719 11.2695C4.86719 12.8095 7.40719 13.7395 9.99719 14.0295" stroke="#1C1C1C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

package/src/icons/ClientIcon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" title="Клиент" viewBox="0 0 24 25" fill="none"><path stroke="#1C1C1C" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15.68 4.124c.48.71.76 1.56.76 2.48-.01 2.4-1.9 4.35-4.28 4.43-.1-.01-.22-.01-.33 0-2.21-.07-4-1.76-4.24-3.92-.29-2.57 1.82-4.95 4.4-4.95M6.99 14.724c-2.42 1.62-2.42 4.26 0 5.87 2.75 1.84 7.26 1.84 10.01 0 2.42-1.62 2.42-4.26 0-5.87-2.73-1.83-7.24-1.83-10.01 0Z"/></svg>

package/src/icons/IconName.ts

@@ -4,9 +4,12 @@
 export const IconsWithoutInversion = new Set([
   'ActualBalanceIcon',
   'AirPlaneIcon',
+  'BagIcon',
+  'BriefcaseIcon',
   'CardWithGemIcon',
   'CarIcon',
   'CinemaIcon',
+  'ClientIcon',
   'ClockIcon',
   'ComfortableCompIcon',
   'CreditCardsIcon',
@@ -51,12 +54,16 @@ export enum IconMap {
   AirPlaneIcon = 'AirPlaneIcon',
   AppleIcon = 'AppleIcon',
   ArrowDownIcon = 'ArrowDownIcon',
+  ArrowDownSolidIcon = 'ArrowDownSolidIcon',
   ArrowLeftIcon = 'ArrowLeftIcon',
   ArrowRightIcon = 'ArrowRightIcon',
   ArrowTopRightIcon = 'ArrowTopRightIcon',
   ArrowUpIcon = 'ArrowUpIcon',
+  ArrowUpSolidIcon = 'ArrowUpSolidIcon',
   AtmIcon = 'AtmIcon',
+  BagIcon = 'BagIcon',
   BankIcon = 'BankIcon',
+  BriefcaseIcon = 'BriefcaseIcon',
   BuildingIcon = 'BuildingIcon',
   BurgerIcon = 'BurgerIcon',
   Calendar2Icon = 'Calendar2Icon',
@@ -71,6 +78,7 @@ export enum IconMap {
   CarIcon = 'CarIcon',
   ChartSquareIcon = 'ChartSquareIcon',
   CinemaIcon = 'CinemaIcon',
+  ClientIcon = 'ClientIcon',
   ClockIcon = 'ClockIcon',
   CloseIcon = 'CloseIcon',
   ComfortableCompIcon = 'ComfortableCompIcon',
@@ -159,12 +167,16 @@ export enum IconTitleMap {
   AirPlaneIcon = 'Самолёт',
   AppleIcon = 'Лого «Apple»',
   ArrowDownIcon = "Стрелка 'Вниз'",
+  ArrowDownSolidIcon = "Стрелка сплошная 'Вниз'",
   ArrowLeftIcon = "Стрелка 'Влево'",
   ArrowRightIcon = "Стрелка 'Вправо'",
   ArrowTopRightIcon = "Стрелка 'Вверх-право'",
   ArrowUpIcon = "Стрелка 'Вверх'",
+  ArrowUpSolidIcon = "Стрелка сплошная 'Вверх'",
   AtmIcon = 'Банкомат',
+  BagIcon = 'Сумка',
   BankIcon = 'Банк',
+  BriefcaseIcon = 'BriefcaseIcon',
   BuildingIcon = 'Здание с деревом',
   BurgerIcon = 'Бургер',
   Calendar2Icon = 'Календарь 2',
@@ -179,6 +191,7 @@ export enum IconTitleMap {
   CarIcon = 'Машина',
   ChartSquareIcon = 'Деньги внутри кошелька',
   CinemaIcon = 'Кинотеатр',
+  ClientIcon = 'Клиент',
   ClockIcon = 'Часы',
   CloseIcon = 'Крестик',
   ComfortableCompIcon = 'Кресло',
@@ -267,7 +280,7 @@ export enum IconTitleMap {
  * @title Иконка
  * @enumNames [
  *   "",
- *   'Деньги', 'Самолёт', 'Лого «Apple»', 'Стрелка \'Вниз\'', 'Стрелка \'Влево\'', 'Стрелка \'Вправо\'', 'Стрелка \'Вверх-право\'', 'Стрелка \'Вверх\'', 'Банкомат', 'Банк', 'Здание с деревом', 'Бургер', 'Календарь 2', 'Скруглённый календарь', 'Календарь', 'Календарь с галочкой', 'Машина2', 'Кред. карта', 'Кред. карта под наклоном', 'Кред. карта с галочкой', 'Карта с драгоценностями', 'Машина', 'Деньги внутри кошелька', 'Кинотеатр', 'Часы', 'Крестик', 'Кресло', 'Кредитные карты', 'Скидка', 'Скачать документ', 'Документ', 'Документ (одноцветный)', 'Документы', 'Документы-2', 'Документ с текстом', 'Доллар', 'Зелёная \'галочка\' в круге', 'Зелёная \'галочка\'', 'Земля', 'Пустой кошелёк с возвратом', 'Пустой кошелёк', 'Евро', 'FullScreenIcon', 'Геолокация', 'Зеркало', 'Глобус', 'Gps', 'Сетка (белая)', 'HeadphonesIcon', 'Сердце', 'Лого «Huawei»', 'Диаграмма роста', 'Скидка', 'JCB', 'Logo', 'Лупа', 'E-mail', 'Маркер карты', 'Маркер карты РСХБ', 'MasterCard', 'Лого Метро', 'Минус', 'МИР', 'Деньги', 'Денежное страхование', 'Купюры', 'Монитор и мобильный', 'Новый документ', 'Офис', 'Лого «Одноклассники»', 'Пачка бумаги А4', 'Бизнес', 'Проценты (круг.)', 'Проценты', 'PercentIcon', 'Персональная карта', 'Телефон', 'Лого «PlayMarket»', 'Плюс', 'Щит', 'Профиль, 2 персоны', 'Профиль', 'Тыква', 'Ошибка', 'Ок', 'Рубль (круг.)', 'Сейф', 'Безопасность', 'Подписанные документы', 'Маленькие часы', 'Звук', 'Ящик с замочной скважиной', 'Лого «Telegram»', 'UnionPay', 'UserGeoLocationIcon', 'Пользователь в рамке', 'Пользователь', 'Visa', 'Лого «VK»', 'Пополнение карты', 'Кошелёк с плюсом', 'Кошелёк', 'Кошелёк с деньгами', 'Добавить продукт', 'Лого «Youtube»'
+ *   'Деньги', 'Самолёт', 'Лого «Apple»', 'Стрелка \'Вниз\'', 'Стрелка сплошная \'Вниз\'', 'Стрелка \'Влево\'', 'Стрелка \'Вправо\'', 'Стрелка \'Вверх-право\'', 'Стрелка \'Вверх\'', 'Стрелка сплошная \'Вверх\'', 'Банкомат', 'Сумка', 'Банк', 'BriefcaseIcon', 'Здание с деревом', 'Бургер', 'Календарь 2', 'Скруглённый календарь', 'Календарь', 'Календарь с галочкой', 'Машина2', 'Кред. карта', 'Кред. карта под наклоном', 'Кред. карта с галочкой', 'Карта с драгоценностями', 'Машина', 'Деньги внутри кошелька', 'Кинотеатр', 'Клиент', 'Часы', 'Крестик', 'Кресло', 'Кредитные карты', 'Скидка', 'Скачать документ', 'Документ', 'Документ (одноцветный)', 'Документы', 'Документы-2', 'Документ с текстом', 'Доллар', 'Зелёная \'галочка\' в круге', 'Зелёная \'галочка\'', 'Земля', 'Пустой кошелёк с возвратом', 'Пустой кошелёк', 'Евро', 'FullScreenIcon', 'Геолокация', 'Зеркало', 'Глобус', 'Gps', 'Сетка (белая)', 'HeadphonesIcon', 'Сердце', 'Лого «Huawei»', 'Диаграмма роста', 'Скидка', 'JCB', 'Logo', 'Лупа', 'E-mail', 'Маркер карты', 'Маркер карты РСХБ', 'MasterCard', 'Лого Метро', 'Минус', 'МИР', 'Деньги', 'Денежное страхование', 'Купюры', 'Монитор и мобильный', 'Новый документ', 'Офис', 'Лого «Одноклассники»', 'Пачка бумаги А4', 'Бизнес', 'Проценты (круг.)', 'Проценты', 'PercentIcon', 'Персональная карта', 'Телефон', 'Лого «PlayMarket»', 'Плюс', 'Щит', 'Профиль, 2 персоны', 'Профиль', 'Тыква', 'Ошибка', 'Ок', 'Рубль (круг.)', 'Сейф', 'Безопасность', 'Подписанные документы', 'Маленькие часы', 'Звук', 'Ящик с замочной скважиной', 'Лого «Telegram»', 'UnionPay', 'UserGeoLocationIcon', 'Пользователь в рамке', 'Пользователь', 'Visa', 'Лого «VK»', 'Пополнение карты', 'Кошелёк с плюсом', 'Кошелёк', 'Кошелёк с деньгами', 'Добавить продукт', 'Лого «Youtube»'
  * ]
  */
 export type IconName =
@@ -276,12 +289,16 @@ export type IconName =
   | 'AirPlaneIcon'
   | 'AppleIcon'
   | 'ArrowDownIcon'
+  | 'ArrowDownSolidIcon'
   | 'ArrowLeftIcon'
   | 'ArrowRightIcon'
   | 'ArrowTopRightIcon'
   | 'ArrowUpIcon'
+  | 'ArrowUpSolidIcon'
   | 'AtmIcon'
+  | 'BagIcon'
   | 'BankIcon'
+  | 'BriefcaseIcon'
   | 'BuildingIcon'
   | 'BurgerIcon'
   | 'Calendar2Icon'
@@ -296,6 +313,7 @@ export type IconName =
   | 'CarIcon'
   | 'ChartSquareIcon'
   | 'CinemaIcon'
+  | 'ClientIcon'
   | 'ClockIcon'
   | 'CloseIcon'
   | 'ComfortableCompIcon'

package/src/services/search/useSearch.ts

@@ -6,6 +6,7 @@ import { useDebouncedEffect } from '../../utils/useDebouncedEffect';
 import { CorpusItem, search, SearchIndex } from './search';
 
 const SEARCH_INDEX_FILENAME = 'search.index.json';
+const DEFAULT_BASE_PATH = ['/'];
 
 export type SearchResult = Array<CorpusItem[]>; // List of pages (CorpusItem) per base path from "basePathList"
 
@@ -21,7 +22,7 @@ export interface SearchInputProps {
 }
 
 export const useSearch = ({
-  basePathList = ['/'],
+  basePathList = DEFAULT_BASE_PATH,
   initialQuery = '',
   wasOpened,
 }: SearchParams): [SearchResult | null, SearchInputProps] => {
@@ -35,7 +36,7 @@ export const useSearch = ({
 
   const key = useMemo(
     () => basePathList.map((_) => (wasOpened ? _ : null)), // Load search index on very first search
-    [wasOpened, ...basePathList],
+    [wasOpened, basePathList],
   );
 
   const { data } = useAsyncData(key, fetchSearchIndex);

package/src/services/sitemap/SitemapData.ts

@@ -6,7 +6,7 @@ import type { IconProps, Picture } from '../../model/Picture';
  * @title Ссылка
  * @required ["text", "href"]
  */
-export interface TopMenuItemProps extends LinkProps {
+export interface TopMenuItemProps extends LinkProps, IconProps {
   /** @hidden */
   items?: LinkProps[];
 }

package/src/{components/Filtration/FiltrationContent.ts → ui-kit/BaseFiltration/BaseFiltrationContent.ts}

@@ -46,29 +46,51 @@ export type StringArray = {
   };
 };
 
-// TODO: Make customizable to implement arbitrary filtration blocks
+export type NumberValue = {
+  title?: Title;
+  /**
+   * @default number
+   * @hidden
+   */
+  type?: 'number';
+};
+
+export type NumberRange = {
+  title?: Title;
+  /**
+   * @default object
+   * @hidden
+   */
+  type?: 'object';
+  /** @title */
+  properties: {
+    /** @title Минимум */
+    min?: NumberValue;
+    /** @title Максимум */
+    max?: NumberValue;
+  };
+};
+
 export type FiltrationSchema = {
-  /** @title Тип недвижимости */
-  propertyType?: StringArray;
-  /** @title Этап строительства */
-  stage?: StringArray;
-  /** @title Категории */
-  categories?: StringArray;
-  /** @title Дополнительно */
-  extraOptions?: StringArray;
+  /** @title Валюта */
+  currency?: StringArray;
+  /** @title Опции */
+  options?: StringArray;
+  /** @title Выплата процентов */
+  percents?: StringArray;
+  /** @hidden */
+  sum?: NumberValue;
+  /** @hidden */
+  period?: NumberRange;
 };
 
 /**
  * @title Кнопка сброса
  */
 export type ResetButton = {
-  /**
-   * @title Текст кнопки
-   */
+  /** @title Текст кнопки */
   text: string;
-  /**
-   * @title Цвет кнопки
-   */
+  /** @title Цвет кнопки */
   version: ButtonVersion;
 };
 
@@ -77,7 +99,7 @@ export type ResetButton = {
  */
 export type NotFound = TitleProps & DescriptionProps;
 
-export interface FiltrationInnerContent {
+export interface BaseFiltrationInnerContent {
   /** @title Название сворачивающейся кнопки */
   label?: string;
   /**
@@ -88,11 +110,3 @@ export interface FiltrationInnerContent {
   resetButton?: ResetButton;
   notFound?: NotFound;
 }
-
-/**
- * @title Фильтрация
- */
-export interface FiltrationContent extends FiltrationInnerContent {
-  /** @title Параметры фильтрации */
-  filtrationSchema?: FiltrationSchema;
-}

package/src/{components/Filtration/FiltrationInner.tsx → ui-kit/BaseFiltration/BaseFiltrationInner.tsx}

@@ -2,24 +2,24 @@ import { JSX } from '@redneckz/uni-jsx';
 import { renderBlocksList } from '../../BlockRenderer/renderBlockList';
 import type { IconName } from '../../icons/IconName';
 import type { UniBlockProps } from '../../model/JSXBlock';
-import { DefaultFoldButton } from '../../ui-kit/Foldable/DefaultFoldButton';
-import { Foldable } from '../../ui-kit/Foldable/Foldable';
-import { FoldableSection } from '../../ui-kit/Foldable/FoldableSection';
-import { Paragraph } from '../../ui-kit/Paragraph/Paragraph';
-import { Text } from '../../ui-kit/Text/Text';
 import { style } from '../../utils/style';
-import { checkShouldRenderBlock } from './checkShouldRenderBlock';
-import type { FiltrationInnerContent, NotFound } from './FiltrationContent';
+import { BaseFiltrationInnerContent, NotFound } from '../BaseFiltration/BaseFiltrationContent';
+import { checkShouldRenderBlock } from '../BaseFiltration/checkShouldRenderBlock';
+import { DefaultFoldButton } from '../Foldable/DefaultFoldButton';
+import { Foldable } from '../Foldable/Foldable';
+import { FoldableSection } from '../Foldable/FoldableSection';
+import { Paragraph } from '../Paragraph/Paragraph';
+import { Text } from '../Text/Text';
 
 const ICONS: IconName[] = ['ArrowDownIcon', 'ArrowUpIcon'];
 
 const resultsGridStyle = 'grid grid-cols-12 gap-1 border-box';
 
-interface FiltrationInnerProps extends FiltrationInnerContent, UniBlockProps {
+interface BaseFiltrationInnerProps extends BaseFiltrationInnerContent, UniBlockProps {
   filtrationState?: Record<string, any>;
 }
 
-export const FiltrationInner = JSX<FiltrationInnerProps>(
+export const BaseFiltrationInner = JSX<BaseFiltrationInnerProps>(
   ({ label = '', filtrationState = {}, topItemsCount = 0, block, notFound, ...rest }) => {
     const blocksToRender =
       block?.blocks?.filter((b) => checkShouldRenderBlock(filtrationState, b.content || {})) || [];

package/src/ui-kit/BaseFiltration/checkShouldRenderBlock.ts

@@ -0,0 +1,49 @@
+import { isEmpty } from '../../utils/isEmpty';
+
+const isSingularFieldMatch =
+  <P extends Partial<Record<string, any>>, T extends P>(key: string, pattern: P) =>
+  (target: T) =>
+    isEmpty(pattern[key]) || isEmpty(target[key]) || pattern[key] === target[key];
+
+const isMultipleFieldMatch =
+  <P extends Partial<Record<string, any[]>>, T extends P>(key: string, pattern: P) =>
+  (target: T) =>
+    isEmpty(pattern[key]) ||
+    isEmpty(target[key]) ||
+    pattern[key]?.some((_) => target[key]?.includes(_));
+
+const isNumberFieldMatch =
+  <P extends Partial<Record<string, number>>, T extends P>(key: string, pattern: P) =>
+  (target: T) =>
+    isEmpty(pattern[key]) ||
+    isEmpty(target[key]) ||
+    naturalNumber(pattern[key]) <= naturalNumber(target[key]);
+
+const isValueInRange =
+  <P extends Partial<Record<string, any>>, T extends P>(key: string, pattern: P) =>
+  (target: T) =>
+    isEmpty(pattern[key]) ||
+    isEmpty(target[key]) ||
+    (naturalNumber(pattern[key]?.min) >= naturalNumber(target[key]?.min) &&
+      naturalNumber(pattern[key]?.min) <= naturalNumber(target[key]?.max));
+
+export const checkShouldRenderBlock = (pattern: Record<string, any>, target: Record<string, any>) =>
+  Object.entries(pattern)
+    .map(([key, subPattern]) => {
+      if (typeof subPattern === 'number') {
+        return isNumberFieldMatch(key, pattern);
+      }
+
+      if (typeof subPattern === 'object') {
+        if ('min' in subPattern && 'max' in subPattern) {
+          return isValueInRange(key, pattern);
+        }
+      }
+
+      return Array.isArray(subPattern)
+        ? isMultipleFieldMatch(key, pattern)
+        : isSingularFieldMatch(key, pattern);
+    })
+    .every((predicate) => predicate(target));
+
+const naturalNumber = (n: any) => Number(n || 0);