@redneckz/wildless-cms-uni-blocks 0.8.31 → 0.9.1

package/src/components/Filtration/FiltrationInner.tsx

@@ -0,0 +1,67 @@
+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 { style } from '../../utils/style';
+import { ErrorBlock } from '../ErrorBlock/ErrorBlock';
+import { checkShouldRenderBlock } from './checkShouldRenderBlock';
+import type { FiltrationInnerContent } from './FiltrationContent';
+
+const ICONS: IconName[] = ['ArrowDownIcon', 'ArrowUpIcon'];
+
+const resultsGridStyle = 'grid grid-cols-12 gap-1 border-box';
+
+interface FiltrationInnerProps extends FiltrationInnerContent, UniBlockProps {
+  filtrationState?: Record<string, any>;
+}
+
+export const FiltrationInner = JSX<FiltrationInnerProps>(
+  ({ label = '', filtrationState = {}, topItemsCount = 0, block, ...rest }) => {
+    const blocksToRender =
+      block?.blocks?.filter((b) => checkShouldRenderBlock(filtrationState, b.content || {})) || [];
+
+    const [visibleBlocks, hiddenBlocks] =
+      topItemsCount > 0
+        ? [blocksToRender.slice(0, topItemsCount), blocksToRender.slice(topItemsCount)]
+        : [blocksToRender, []];
+
+    return (
+      <div>
+        <div className={style(blocksToRender.length ? 'hidden' : '')}>
+          <ErrorBlock
+            error={{ errorContentType: 'Image' }}
+            title="Нет подходящей ипотечной программы"
+            subtitle="Попробуйте очистить фильтры"
+          />
+        </div>
+        <div className={style(blocksToRender.length ? '' : 'hidden')}>
+          <div className={resultsGridStyle}>
+            {renderBlocksList(visibleBlocks, { ...rest.options, parent: block })}
+          </div>
+          <Foldable
+            renderFoldableSection={({ isUnfolded }) => {
+              return (
+                <FoldableSection className={resultsGridStyle} isUnfolded={isUnfolded}>
+                  {renderBlocksList(hiddenBlocks, { ...rest.options, parent: block })}
+                </FoldableSection>
+              );
+            }}
+            renderFoldButton={({ isUnfolded, onToggle }) => (
+              <DefaultFoldButton
+                className={style('mt-11', topItemsCount < 1 ? 'hidden' : '')}
+                disabled={!hiddenBlocks?.length}
+                label={label}
+                icon={ICONS[Number(isUnfolded)]}
+                dataTheme={rest.options?.page?.colorPalette}
+                onClick={onToggle}
+              />
+            )}
+          />
+        </div>
+      </div>
+    );
+  },
+);

package/src/components/Filtration/checkShouldRenderBlock.ts

@@ -0,0 +1,18 @@
+const isSingularFieldMatch =
+  <P extends Partial<Record<string, any>>, T extends P>(key: string, pattern: P) =>
+  (target: T) =>
+    pattern[key] === undefined || pattern[key] === target[key];
+
+const isMultipleFieldMatch =
+  <P extends Partial<Record<string, any[]>>, T extends P>(key: string, pattern: P) =>
+  (target: T) =>
+    pattern[key] === undefined || pattern[key]?.every((_) => target[key]?.includes(_));
+
+export const checkShouldRenderBlock = (pattern: Record<string, any>, target: Record<string, any>) =>
+  Object.entries(pattern)
+    .map(([key, subPattern]) =>
+      Array.isArray(subPattern)
+        ? isMultipleFieldMatch(key, pattern)
+        : isSingularFieldMatch(key, pattern),
+    )
+    .every((predicate) => predicate(target));

package/src/components/Filtration/renderFormItem.tsx

@@ -0,0 +1,36 @@
+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';
+
+export const renderFormItem =
+  (filtrationSchema: FiltrationSchema, register: FormElementRegisterer) => (key: string) => {
+    const item = filtrationSchema[key as keyof typeof filtrationSchema];
+    const type = item?.type;
+
+    switch (type) {
+      case 'string':
+        return renderRadioButtons(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] || '' })) || [];
+
+    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>
+    );
+  };

package/src/components/ProductBlock/ProductBlock.example.json

@@ -46,6 +46,7 @@
           "icon": "SignDocsIcon"
         }
       }
-    ]
+    ],
+    "directionRight": true
   }
 }

package/src/components/ProductBlock/ProductBlock.fixture.tsx

@@ -93,6 +93,23 @@ export default {
       />
     </div>
   ),
+  'primary with back button direction left': (
+    <div className="container grid grid-cols-12">
+      <ProductBlock
+        className="col-span-12"
+        backwardButton={backwardButton}
+        headlineVersion="L"
+        title="Потребительский кредит наличными"
+        description="Кредит наличными без залога и поручительства. Потребительский кредит на любые цели. Нужен только паспорт."
+        benefitsCountOfRow={2}
+        benefits={benefits}
+        benefitsVersion="normal"
+        buttons={buttons}
+        image={image}
+        directionRight={false}
+      />
+    </div>
+  ),
   'primary with color benefits': (
     <div className="container grid grid-cols-12">
       <ProductBlock

package/src/components/ProductBlock/ProductBlockContent.ts

@@ -36,6 +36,8 @@ export type ProductBlockInnerContent = HeadlineProps &
      * @hidden
      */
     textBlockClassName?: string;
+    /** @title Картинка справа/текст слева */
+    directionRight?: boolean;
   };
 
 /**

package/src/components/ProductBlock/ProductBlockInner.tsx

@@ -29,12 +29,16 @@ export const ProductBlockInner = JSX<ProductBlockInnerProps>(
     version = 'primary',
     isDotted = true,
     textBlockClassName = '',
+    directionRight = true,
   }) => {
     const benefitsCount = benefits?.filter((_) => _.label)?.length;
     const benefitsContainerStyles = getBenefitsContainerStyles(benefitsCountOfRow);
 
     return (
       <div className={style('flex grow justify-between items-stretch h-full', className)}>
+        {image?.src ? (
+          <Img className={`mt-[-50px] ${directionRight ? 'order-2' : ''}`} image={image} />
+        ) : null}
         <div className={style('flex flex-col', textBlockClassName)}>
           <Headline
             className="!p-0 max-w-[600px]"
@@ -67,7 +71,6 @@ export const ProductBlockInner = JSX<ProductBlockInnerProps>(
             {footnote ? <p className="text-m-light pt-12">{footnote}</p> : null}
           </div>
         </div>
-        {image?.src && <Img className="mt-[-50px]" image={image} />}
       </div>
     );
   },

package/src/hooks/useForm.ts

@@ -0,0 +1,29 @@
+import { useCallback, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
+
+export type FormElementRegisterer = ReturnType<typeof useForm>['register'];
+
+export const useForm = <FormState extends Record<string, any>>(
+  initialState: Partial<FormState> = {},
+) => {
+  const [formState, setFormState] = useState<Partial<FormState>>(initialState);
+
+  const handlersMap = useRef<Partial<Record<keyof FormState, () => void>>>({});
+
+  const register = <FieldName extends keyof FormState>(fieldName: FieldName) => {
+    if (!handlersMap.current) {
+      return {};
+    }
+
+    const handler = (value?: FormState[FieldName]) => {
+      setFormState((prev) => ({ ...prev, [fieldName]: value }));
+    };
+
+    handlersMap.current[fieldName] ||= handler;
+
+    return { value: formState?.[fieldName], onChange: handlersMap.current[fieldName] };
+  };
+
+  const resetForm = useCallback(() => setFormState({}), []);
+
+  return { formState, register, resetForm };
+};

package/src/model/JSXBlock.ts

@@ -1,4 +1,5 @@
 import type { UNIComponent } from '@redneckz/uni-jsx';
+import type { JSONSchema7Definition } from 'json-schema';
 import type { BlockRendererOptions } from '../BlockRenderer/BlockRendererOptions';
 import type { SlotName } from './BlockDecorator';
 import type { BlockVersion } from './BlockVersion';
@@ -26,5 +27,6 @@ export type JSXBlock<BlockProps extends UniBlockProps = UniBlockProps> = UNIComp
   VNode | VNode[]
 > & {
   childrenTypes?: string[] | { include?: string[]; exclude?: string[] };
+  childSchema?: (content: BlockDef['content']) => Record<string, JSONSchema7Definition>;
   slots?: (props: BlockProps) => SlotName[];
 };

package/src/ui-kit/ControlProps.ts

@@ -0,0 +1,4 @@
+export interface ControlProps<T> {
+  value?: T;
+  onChange?: (value: T | undefined) => void;
+}

package/src/ui-kit/Foldable/DefaultFoldButton.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { ColorPalette } from '../../model/ContentPageDef';
+import { style } from '../../utils/style';
 import type { IconName } from '../Icon/IconProps';
 import { Img } from '../Img/Img';
 import type { FoldablePartProps } from './FoldablePartProps';
@@ -9,25 +10,24 @@ interface DefaultFoldButtonProps {
   label: string;
   icon: IconName;
   dataTheme?: ColorPalette;
+  disabled?: boolean;
   onClick?: () => void;
 }
 
 export const DefaultFoldButton = JSX<DefaultFoldButtonProps>(
-  ({ className = '', label, icon, dataTheme = '', onClick }) => {
-    const STATE_STYLE =
-      'hover:bg-primary-hover focus:border-primary-text active:bg-primary-active outline-none';
-    const DIMENSIONS_STYLE = 'flex justify-center w-full px-0 py-5';
-
+  ({ className = '', label, icon, dataTheme = '', disabled = false, onClick }) => {
     return (
       <button
-        className={[
-          'border border-transparent bg-primary-main font-sans text-white cursor-pointer',
-          STATE_STYLE,
-          DIMENSIONS_STYLE,
+        className={style(
+          'flex justify-center w-full px-0 py-5 border border-transparent outline-none focus:border-primary-text',
+          disabled
+            ? 'bg-main-divider text-main-disabled hover:bg-main-divider'
+            : 'bg-primary-main text-white hover:bg-primary-hove',
           className,
-        ].join(' ')}
-        data-theme={dataTheme}
+        )}
         onClick={onClick}
+        disabled={disabled}
+        data-theme={dataTheme}
       >
         <span className="text-h4 pr-3">{label}</span>
         {icon ? (

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

@@ -3,7 +3,7 @@ import { SlideCheckbox } from './SlideCheckbox';
 export default {
   primary: (
     <div className="bg-white">
-      <SlideCheckbox checked={true} text={'Checkbox'} />
+      <SlideCheckbox value={true} text={'Checkbox'} />
     </div>
   ),
 };

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

@@ -1,33 +1,36 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { Text } from '../../ui-kit/Text/Text';
+import { Text } from '../Text/Text';
 
 interface SlideCheckboxProps {
-  checked?: boolean;
+  value?: boolean;
   text?: string;
-  onClick?: () => void;
+  type?: 'checkbox' | 'radio';
+  onChange?: (value: boolean) => void;
 }
-export const SlideCheckbox = JSX<SlideCheckboxProps>(({ checked, text, onClick }) => (
-  <div
-    role="checkbox"
-    aria-checked={checked}
-    className="flex justify-start items-center w-full cursor-pointer mb-4"
-    onClick={() => onClick && onClick()}
-  >
+export const SlideCheckbox = JSX<SlideCheckboxProps>(
+  ({ value = false, text, type = 'checkbox', onChange }) => (
     <div
-      className={`relative duration-300 w-9 h-5 mr-3 rounded rounded-2xl ${
-        checked ? 'bg-primary-main' : 'bg-main-divider'
-      }`}
+      role={type}
+      aria-checked={value}
+      className="flex justify-start items-center w-full cursor-pointer mb-4"
+      onClick={() => onChange && onChange(!value)}
     >
       <div
-        className={`absolute opacity-80 duration-500 top-0.5 w-4 h-4 bg-white rounded rounded-full ${
-          checked ? 'left-[50%]' : 'left-[5%]'
+        className={`relative flex-shrink-0 duration-300 w-9 h-5 mr-3 rounded-2xl ${
+          value ? 'bg-primary-main' : 'bg-main-divider'
         }`}
-      />
+      >
+        <div
+          className={`absolute opacity-80 duration-500 top-0.5 w-4 h-4 bg-white rounded-full ${
+            value ? 'left-[50%]' : 'left-[5%]'
+          }`}
+        />
+      </div>
+      <div>
+        <Text size="text-m" font="font-light" color="text-primary-text">
+          {text}
+        </Text>
+      </div>
     </div>
-    <div>
-      <Text size="text-m" font="font-light" color="text-primary-text">
-        {text}
-      </Text>
-    </div>
-  </div>
-));
+  ),
+);

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

@@ -0,0 +1,44 @@
+import { JSX } from '@redneckz/uni-jsx';
+import type { ControlProps } from '../ControlProps';
+import { SlideCheckbox } from '../SlideCheckbox/SlideCheckbox';
+
+type SlideCheckboxGroupItem = {
+  value: string;
+  title: string;
+};
+
+interface SlideCheckboxGroupProps extends ControlProps<string> {
+  multiple: false;
+  items: SlideCheckboxGroupItem[];
+}
+
+interface MultipleSlideCheckboxGroupProps extends ControlProps<string[]> {
+  multiple: true;
+  items: SlideCheckboxGroupItem[];
+}
+
+export const SlideCheckboxGroup = JSX<SlideCheckboxGroupProps | MultipleSlideCheckboxGroupProps>(
+  ({ value, onChange, items = [], multiple }) => {
+    const handleChange = (newValue: string) => {
+      if (multiple) {
+        const hasAlready = value?.includes(newValue);
+        onChange &&
+          onChange(
+            hasAlready ? value?.filter((v) => v !== newValue) : [...(value || []), newValue],
+          );
+      } else {
+        onChange && onChange(value === newValue ? undefined : newValue);
+      }
+    };
+
+    return items.map((item) => (
+      <SlideCheckbox
+        key={item.value}
+        text={item.title}
+        value={[value].flatMap((_) => _).includes(item.value)}
+        onChange={() => handleChange(item.value)}
+        type={multiple ? 'checkbox' : 'radio'}
+      />
+    ));
+  },
+);