@redneckz/wildless-cms-uni-blocks 0.9.10 → 0.9.11

package/src/components/Filtration/Filtration.tsx

@@ -15,19 +15,14 @@ export const Filtration: JSXBlock<FiltrationProps> = JSX<FiltrationProps>(
     const { formState, register, resetForm } = useForm();
 
     return (
-      <BlockWrapper className={style('p-9', className)} {...rest}>
-        <form className="flex justify-between">
+      <BlockWrapper className={style(className)} version="transparent" {...rest}>
+        <form className="flex justify-between bg-white p-9 mb-1">
           <div className="flex gap-11">
             {Object.keys(filtrationSchema).map(renderFormItem(filtrationSchema, register))}
           </div>
           {resetButton ? (
             <div>
-              <Button
-                className="w-72"
-                text={resetButton.text}
-                version={resetButton.buttonVersion}
-                onClick={resetForm}
-              />
+              <Button className="w-72" onClick={resetForm} {...resetButton} />
             </div>
           ) : null}
         </form>

package/src/components/Filtration/FiltrationContent.ts

@@ -1,4 +1,5 @@
 import type { ButtonVersion } from '../../model/ButtonVersion';
+import type { DescriptionProps, TitleProps } from '../../model/HeadlineType';
 
 /**
  * @title Заголовок
@@ -33,6 +34,7 @@ export type StringArray = {
    * @hidden
    */
   type?: 'array';
+  /** @title */
   items?: {
     /**
      * @default string
@@ -47,13 +49,13 @@ export type StringArray = {
 // TODO: Make customizable to implement arbitrary filtration blocks
 export type FiltrationSchema = {
   /** @title Тип недвижимости */
-  propertyType?: StringEnum;
+  propertyType?: StringArray;
   /** @title Этап строительства */
-  stage?: StringEnum;
+  stage?: StringArray;
   /** @title Категории */
-  categories?: StringEnum;
+  categories?: StringArray;
   /** @title Дополнительно */
-  extraOptions?: StringEnum;
+  extraOptions?: StringArray;
 };
 
 /**
@@ -67,14 +69,24 @@ export type ResetButton = {
   /**
    * @title Цвет кнопки
    */
-  buttonVersion: ButtonVersion;
+  version: ButtonVersion;
 };
 
+/**
+ * @title Плитка "Не найдено"
+ */
+export type NotFound = TitleProps & DescriptionProps;
+
 export interface FiltrationInnerContent {
-  /** @title Название кнопки */
+  /** @title Название сворачивающейся кнопки */
   label?: string;
-  /** @title Количество отображаемых предметов */
+  /**
+   * @title Количество отображаемых предметов
+   * @minimum 1
+   */
   topItemsCount?: number;
+  resetButton?: ResetButton;
+  notFound?: NotFound;
 }
 
 /**
@@ -83,5 +95,4 @@ export interface FiltrationInnerContent {
 export interface FiltrationContent extends FiltrationInnerContent {
   /** @title Параметры фильтрации */
   filtrationSchema?: FiltrationSchema;
-  resetButton?: ResetButton;
 }

package/src/components/Filtration/FiltrationInner.tsx

@@ -5,10 +5,11 @@ 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 { ErrorBlock } from '../ErrorBlock/ErrorBlock';
 import { checkShouldRenderBlock } from './checkShouldRenderBlock';
-import type { FiltrationInnerContent } from './FiltrationContent';
+import type { FiltrationInnerContent, NotFound } from './FiltrationContent';
 
 const ICONS: IconName[] = ['ArrowDownIcon', 'ArrowUpIcon'];
 
@@ -19,7 +20,7 @@ interface FiltrationInnerProps extends FiltrationInnerContent, UniBlockProps {
 }
 
 export const FiltrationInner = JSX<FiltrationInnerProps>(
-  ({ label = '', filtrationState = {}, topItemsCount = 0, block, ...rest }) => {
+  ({ label = '', filtrationState = {}, topItemsCount = 0, block, notFound, ...rest }) => {
     const blocksToRender =
       block?.blocks?.filter((b) => checkShouldRenderBlock(filtrationState, b.content || {})) || [];
 
@@ -30,28 +31,27 @@ export const FiltrationInner = JSX<FiltrationInnerProps>(
 
     return (
       <div>
-        <div className={style(blocksToRender.length ? 'hidden' : '')}>
-          <ErrorBlock
-            error={{ errorContentType: 'Image' }}
-            title="Нет подходящей ипотечной программы"
-            subtitle="Попробуйте очистить фильтры"
-          />
+        <div className={style(blocksToRender.length ? 'hidden' : 'block')}>
+          {notFound ? renderNotFound(notFound) : null}
         </div>
         <div className={style(blocksToRender.length ? '' : 'hidden')}>
-          <div className={resultsGridStyle}>
+          <div className={style('mb-1', resultsGridStyle)}>
             {renderBlocksList(visibleBlocks, { ...rest.options, parent: block })}
           </div>
           <Foldable
             renderFoldableSection={({ isUnfolded }) => {
               return (
-                <FoldableSection className={resultsGridStyle} isUnfolded={isUnfolded}>
+                <FoldableSection
+                  className={style(resultsGridStyle, isUnfolded ? 'mb-1' : '')}
+                  isUnfolded={isUnfolded}
+                >
                   {renderBlocksList(hiddenBlocks, { ...rest.options, parent: block })}
                 </FoldableSection>
               );
             }}
             renderFoldButton={({ isUnfolded, onToggle }) => (
               <DefaultFoldButton
-                className={style('mt-11', topItemsCount < 1 ? 'hidden' : '')}
+                className={style(topItemsCount < 1 ? 'hidden' : '')}
                 disabled={!hiddenBlocks?.length}
                 label={label}
                 icon={ICONS[Number(isUnfolded)]}
@@ -65,3 +65,22 @@ export const FiltrationInner = JSX<FiltrationInnerProps>(
     );
   },
 );
+
+function renderNotFound({ title, description }: NotFound) {
+  return (
+    <div className="bg-white py-20">
+      {title ? (
+        <div className="mb-2">
+          <Paragraph align="text-center">
+            <Text size="text-h4">{title}</Text>
+          </Paragraph>
+        </div>
+      ) : null}
+      {description ? (
+        <Paragraph size="text-xl" font="font-light" align="text-center">
+          {description}
+        </Paragraph>
+      ) : null}
+    </div>
+  );
+}

package/src/components/Filtration/renderFormItem.tsx

@@ -1,7 +1,7 @@
 import type { FormElementRegisterer } from '../../hooks/useForm';
 import { SlideCheckboxGroup } from '../../ui-kit/SlideCheckboxGroup/SlideCheckboxGroup';
 import { Text } from '../../ui-kit/Text/Text';
-import type { FiltrationSchema, StringEnum } from './FiltrationContent';
+import type { FiltrationSchema, StringArray } from './FiltrationContent';
 
 export const renderFormItem =
   (filtrationSchema: FiltrationSchema, register: FormElementRegisterer) => (key: string) => {
@@ -9,28 +9,28 @@ export const renderFormItem =
     const type = item?.type;
 
     switch (type) {
-      case 'string':
-        return renderRadioButtons(key, register)(item);
+      case 'array':
+        return renderCheckboxes(key, register)(item);
       default:
         return null;
     }
   };
 
-const renderRadioButtons =
-  (key: string, register: FormElementRegisterer) => (item?: StringEnum) => {
-    const options =
-      item?.enum?.map((e, i) => ({ value: e, title: item?.enumNames?.[i] || '' })) || [];
+const renderCheckboxes = (key: string, register: FormElementRegisterer) => (item?: StringArray) => {
+  const options =
+    item?.items?.enum?.map((e, i) => ({ value: e, title: item?.items?.enumNames?.[i] || '' })) ||
+    [];
 
-    return (
-      <div role="radiogroup" key={key}>
-        {item?.title ? (
-          <div className="mb-4">
-            <Text size="text-m" font="font-light" color="text-secondary-text">
-              {item.title}
-            </Text>
-          </div>
-        ) : null}
-        <SlideCheckboxGroup items={options} multiple={false} {...register(key)} />
-      </div>
-    );
-  };
+  return (
+    <div key={key}>
+      {item?.title ? (
+        <div className="mb-4">
+          <Text size="text-m" font="font-light" color="text-secondary-text">
+            {item.title}
+          </Text>
+        </div>
+      ) : null}
+      <SlideCheckboxGroup items={options} multiple {...register(key)} />
+    </div>
+  );
+};

package/src/components/RichTextBlock/RichTextBlock.example.json

@@ -1,5 +1,5 @@
 {
   "content": {
-    "__html": "<p class=\"h1\">Заголовок 1</p>\n<p class=\"h2\">Заголовок 2</p>\n<p class=\"h3\">Заголовок 3</p>\n<p class=\"h4\">Заголовок 4</p>\n<p class=\"h5\">Заголовок 5</p>\n<p class=\"h6\">Заголовок 6</p>\n<p>Параграф, в котором много текста и даже <a href=\"#\">ссылка</a></p>\n<p><strong>Жирный текст</strong>, <em>Наклонный текст</em></p>\n<ul>\n  <li>Список с точками</li>\n  <li>Список с точками</li>\n</ul>\n<ol>\n  <li>Нумерованный список</li>\n  <li>Нумерованный список</li>\n</ol>\n"
+    "__html": "<h1>Заголовок 1</h1>\n<h2>Заголовок 2</h2>\n<h3>Заголовок 3</h3>\n<h4>Заголовок 4</h4>\n<h5>Заголовок 5</h5>\n<h6>Заголовок 6</h6>\n<p>Параграф, в котором много текста и даже <a href=\"#\">ссылка</a></p>\n<p><strong>Жирный текст</strong>, <em>Наклонный текст</em></p>\n<ul>\n  <li>Список с точками</li>\n  <li>Список с точками</li>\n</ul>\n<ol>\n  <li>Нумерованный список</li>\n  <li>Нумерованный список</li>\n</ol>\n"
   }
 }