@redneckz/wildless-cms-uni-blocks 0.14.119 → 0.14.121

package/src/components/DepositFiltration/DepositFiltration.fixture.tsx

@@ -57,6 +57,7 @@ const SCHEMA: DepositFiltrationContent['filtrationSchema'] = {
       enum: ['rub', 'usd', 'eur'],
       enumNames: ['Рубль', 'Доллар', 'Евро'],
     },
+    single: true,
   },
   options: {
     title: 'Опции',

package/src/components/Footer/Contacts.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { LinkButton } from '../../ui-kit/LinkButton/LinkButton';
+import { Paragraph } from '../../ui-kit/Paragraph/Paragraph';
 import { Text } from '../../ui-kit/Text/Text';
 import { type ContactGroup, type ContactInfo } from './FooterContent';
 
@@ -23,20 +24,22 @@ export const Contacts = JSX<ContactsProps>(({ className = '', items }) => (
 ));
 
 const renderContactsGroup = (item: ContactGroup, i: number) => (
-  <div className="mb-m" key={String(i)}>
-    <div className="mb-m">
+  <div className="mb-m space-y-m" key={String(i)}>
+    <div>
       <Text size="text-l" font="font-medium">
         {item?.title}
       </Text>
     </div>
-    <div>{item.items?.map(renderContact)}</div>
+    <div className="space-y-m">{item.items?.map(renderContact)}</div>
   </div>
 );
 
 const renderContact = (item: ContactInfo, index: number) => (
-  <div className="mb-m" key={String(index)}>
+  <div className="space-y-2xs" key={String(index)}>
     <div>{renderText(item.type, item.text)}</div>
-    <div className="mt-2xs text-s font-light text-secondary-text">{item.description}</div>
+    <Paragraph size="text-s" font="font-light" color="text-secondary-text">
+      {item.description}
+    </Paragraph>
   </div>
 );
 
@@ -45,16 +48,18 @@ const renderText = (type: ContactInfo['type'], text = '') => {
     case 'tel':
       return (
         <a
-          className="text-h6 text-primary-text hover:text-primary-main no-underline"
+          className="text-primary-text hover:text-primary-main no-underline"
           href={`tel:${formatTel(text)}`}
         >
-          {text}
+          <Text size="text-h6">{text}</Text>
         </a>
       );
     case 'email':
       return (
-        <a className="text-xl font-light text-primary-text no-underline" href={`mailto:${text}`}>
-          {text}
+        <a className="no-underline" href={`mailto:${text}`}>
+          <Paragraph size="text-xl" font="font-light" color="text-primary-text">
+            {text}
+          </Paragraph>
         </a>
       );
     default:

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

@@ -16,17 +16,6 @@ type Enum = string[];
  */
 type EnumNames = string[];
 
-export type StringEnum = {
-  title?: Title;
-  /**
-   * @default string
-   * @hidden
-   */
-  type?: 'string';
-  enum?: Enum;
-  enumNames?: EnumNames;
-};
-
 export type StringArray = {
   title?: Title;
   /**
@@ -34,6 +23,10 @@ export type StringArray = {
    * @hidden
    */
   type?: 'array';
+  /** @title Минимальное количество */
+  minItems?: number;
+  /** @title Максимальное количество */
+  maxItems?: number;
   /** @title */
   items?: {
     /**
@@ -44,6 +37,8 @@ export type StringArray = {
     enum?: Enum;
     enumNames?: EnumNames;
   };
+  /** @title В подборщике выбирается только одна опция */
+  single?: boolean;
 };
 
 export type NumberValue = {
@@ -71,19 +66,6 @@ export type NumberRange = {
   };
 };
 
-export type FiltrationSchema = {
-  /** @title Валюта */
-  currency?: StringArray;
-  /** @title Опции */
-  options?: StringArray;
-  /** @title Выплата процентов */
-  percents?: StringArray;
-  /** @hidden */
-  sum?: NumberValue;
-  /** @hidden */
-  period?: NumberRange;
-};
-
 /**
  * @title Кнопка сброса
  */

package/src/ui-kit/BaseFiltration/renderFiltrationForm.tsx

@@ -8,10 +8,9 @@ import {
   type NumberRange,
   type NumberValue,
   type StringArray,
-  type StringEnum,
 } from './BaseFiltrationContent';
 
-type SchemaItem = StringArray | StringEnum | NumberRange | NumberValue;
+type SchemaItem = StringArray | NumberRange | NumberValue;
 type FiltrationSchema = Record<string, SchemaItem>;
 
 interface RenderFiltrationFormProps {
@@ -71,7 +70,11 @@ const renderCheckboxes = (key: string, field: FormFieldRegisterer<any>) => (item
           </Text>
         </div>
       ) : null}
-      <SlideCheckboxGroup items={options} multiple {...field<string, string[] | undefined>(key)} />
+      <SlideCheckboxGroup
+        items={options}
+        multiple={!item?.single}
+        {...field<string, string[] | undefined>(key)}
+      />
     </div>
   );
 };

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

@@ -7,31 +7,26 @@ type SlideCheckboxGroupItem = {
   title: string;
 };
 
-interface SlideCheckboxGroupProps extends ControlProps<string> {
-  multiple: false;
+interface SlideCheckboxGroupProps extends ControlProps<string[]> {
+  multiple?: boolean;
   items?: SlideCheckboxGroupItem[];
 }
 
-interface MultipleSlideCheckboxGroupProps extends ControlProps<string[]> {
-  multiple: true;
-  items?: SlideCheckboxGroupItem[];
-}
-
-export const SlideCheckboxGroup = JSX<SlideCheckboxGroupProps | MultipleSlideCheckboxGroupProps>(
+export const SlideCheckboxGroup = JSX<SlideCheckboxGroupProps>(
   ({ value, onChange, items = [], multiple }) => {
     const handleChange = (newValue: string) => {
       if (!onChange) {
         return;
       }
 
-      if (multiple) {
-        const hasAlready = value?.includes(newValue);
+      const hasAlready = value?.includes(newValue);
 
+      if (multiple) {
         onChange(
           hasAlready ? (value || []).filter((v) => v !== newValue) : [...(value || []), newValue],
         );
       } else {
-        onChange(value === newValue ? '' : newValue);
+        onChange(hasAlready ? [] : [newValue]);
       }
     };