@astral/ui 4.29.0 → 4.31.0

package/node/hook-form/FormFilters/styles.d.ts

@@ -3,30 +3,12 @@ export declare const Wrapper: import("@emotion/styled/dist/declarations/src/type
     theme?: import("@emotion/react").Theme | undefined;
     as?: import("react").ElementType<any, keyof import("react").JSX.IntrinsicElements> | undefined;
 }, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, {}>;
-export declare const AllFiltersButtonWrapper: import("@emotion/styled/dist/declarations/src/types").StyledComponent<{
-    theme?: import("@emotion/react").Theme | undefined;
-    as?: import("react").ElementType<any, keyof import("react").JSX.IntrinsicElements> | undefined;
-}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, {}>;
 export declare const MainFiltersWrapper: import("@emotion/styled/dist/declarations/src/types").StyledComponent<{
     theme?: import("@emotion/react").Theme | undefined;
     as?: import("react").ElementType<any, keyof import("react").JSX.IntrinsicElements> | undefined;
 } & {
     columns?: string | undefined;
 }, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, {}>;
-export declare const StyledBadge: import("@emotion/styled/dist/declarations/src/types").StyledComponent<Omit<import("../..").WithoutEmotionSpecific<import("@mui/material/Badge").BadgeProps>, "color"> & {
-    color: import("../../components/Badge").BadgeColor;
-    withBorder?: boolean | undefined;
-    variantColor?: import("../../components/Badge").BadgeVariantsColor | undefined;
-} & {
-    theme?: import("@emotion/react").Theme | undefined;
-}, {}, {}>;
-export declare const StyledCounter: import("@emotion/styled/dist/declarations/src/types").StyledComponent<Omit<import("../..").WithoutEmotionSpecific<import("@mui/material/Badge").BadgeProps>, "content" | "color" | "children" | "variant" | "invisible" | "anchorOrigin" | "badgeContent" | "overlap" | "withBorder"> & {
-    color: import("../../components/Counter/types").CounterColor;
-    variant?: import("../../components/Counter/types").CounterVariants | undefined;
-    content?: number | undefined;
-} & {
-    theme?: import("@emotion/react").Theme | undefined;
-}, {}, {}>;
 export declare const SubmitButtonWrapper: import("@emotion/styled/dist/declarations/src/types").StyledComponent<{
     theme?: import("@emotion/react").Theme | undefined;
     as?: import("react").ElementType<any, keyof import("react").JSX.IntrinsicElements> | undefined;

package/node/hook-form/FormFilters/styles.js

@@ -1,11 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SubmitButtonWrapper = exports.StyledCounter = exports.StyledBadge = exports.MainFiltersWrapper = exports.AllFiltersButtonWrapper = exports.Wrapper = void 0;
-const Badge_1 = require("@mui/material/Badge");
+exports.SubmitButtonWrapper = exports.MainFiltersWrapper = exports.Wrapper = void 0;
 const FormLabel_1 = require("@mui/material/FormLabel");
 const InputBase_1 = require("@mui/material/InputBase");
-const Badge_2 = require("../../components/Badge");
-const Counter_1 = require("../../components/Counter");
 const styled_1 = require("../../components/styled");
 const constants_1 = require("./constants");
 exports.Wrapper = styled_1.styled.div `
@@ -35,41 +32,6 @@ exports.Wrapper = styled_1.styled.div `
     }
   }
 `;
-exports.AllFiltersButtonWrapper = styled_1.styled.div `
-  display: none;
-
-  white-space: nowrap;
-
-  &.${constants_1.formFiltersClassnames.showAllFiltersButtonOnDesktop} {
-    display: flex;
-  }
-
-  ${({ theme }) => theme.breakpoints.down('sm')} {
-    margin-right: 0;
-    &.${constants_1.formFiltersClassnames.showAllFiltersButtonOnMobile} {
-      display: flex;
-    }
-
-    &.${constants_1.formFiltersClassnames.withoutSearch} {
-      width: 100%;
-
-      .${constants_1.formFiltersClassnames.allFiltersButton} {
-        width: 100%;
-      }
-    }
-
-    &.${constants_1.formFiltersClassnames.withSearch} {
-      .${constants_1.formFiltersClassnames.allFiltersButton} {
-         display: unset;
-         gap: 0;
-
-         padding: 8px;
-
-         font-size: 0;
-      }
-    }
-  }
-`;
 exports.MainFiltersWrapper = styled_1.styled.div `
   display: grid;
   grid-auto-flow: column;
@@ -82,19 +44,6 @@ exports.MainFiltersWrapper = styled_1.styled.div `
     display: none;
   }
 `;
-exports.StyledBadge = (0, styled_1.styled)(Badge_2.Badge) `
-   width: 100%; 
-  .${Badge_1.badgeClasses.dot} {
-      ${({ theme }) => theme.breakpoints.up('sm')} {
-        display: none;
-      }
-    }
-`;
-exports.StyledCounter = (0, styled_1.styled)(Counter_1.Counter) `
-  ${({ theme }) => theme.breakpoints.down('sm')} {
-    display: none;
-  }
-`;
 exports.SubmitButtonWrapper = styled_1.styled.div `
   white-space: nowrap;
 

package/node/hook-form/FormFilters/types.d.ts

@@ -1,45 +1,36 @@
 import { type ObjectAsyncGuard, type ObjectGuard } from '@astral/validations';
 import { type ReactNode } from 'react';
-import { type Control } from 'react-hook-form';
+import { type Control, type UseFormReturn } from 'react-hook-form';
 import type { ButtonProps } from '../../components/Button';
 type InputsProps<TFieldValues extends Record<string, unknown>> = {
     control: Control<TFieldValues>;
 };
 export type FormFiltersProps<TFieldValues extends Record<string, unknown>> = {
+    form: UseFormReturn<TFieldValues>;
+    onSubmit?: (values: TFieldValues) => void;
     /**
      * Схема валидации из @astral/validations
      */
     validationSchema?: ObjectGuard<TFieldValues> | ObjectAsyncGuard<TFieldValues>;
-    /**
-     * Значения фильтров
-     */
-    values?: TFieldValues;
-    /**
-     * Callback вызываемый при изменении значений фильтров. Вызывается с debounce (300ms)
-     */
-    onChange: (values: TFieldValues) => void;
     /**
      * Поле поиска
      *
      * @example
      * ```ts
      * <FormFilters
-     *   SearchField={(props) => <FormFiltersSearchField {...props} placeholder="Поиск..." />}
+     *   SearchField={({control}) => <FormFiltersSearchField control={control} placeholder="Поиск..." />}
      * />
      * ```
      */
-    searchField?: (props: InputsProps<TFieldValues> & {
-        fullWidth?: boolean;
-    }) => ReactNode;
+    searchField?: (props: InputsProps<TFieldValues>) => ReactNode;
     /**
      * Основные фильтры
      *
      * @example
      * ```ts
      * <FormFilters
-     *   MainFilters={({ control, isModal, ...props }) =>
+     *   MainFilters={({ control, isModal }) =>
      *    <FormTextField
-     *      {...props}
      *      control={control}
      *      name="name"
      *      label="Название"
@@ -57,7 +48,7 @@ export type FormFiltersProps<TFieldValues extends Record<string, unknown>> = {
      * @example
      * ```ts
      * <FormFilters
-     *   SecondaryFilters={({ control, ...props }) => <FormTextField {...props} control={control} placeholder="Введите название" />}
+     *   SecondaryFilters={({ control }) => <FormTextField control={control} name="name" label="Название" placeholder="Введите название" />}
      * />
      * ```
      */

package/node/hook-form/FormFilters/useLogic/useLogic.d.ts

@@ -1,18 +1,17 @@
-import { type UseFormReturn } from '../../useForm';
+import { type UseFormReturn } from 'react-hook-form';
 import { type FormFiltersDialogProps } from '../FormFiltersDialog/types';
 import { type FormFiltersProps } from '../types';
 type UseLogicReturn<TFieldValues extends Record<string, unknown>> = {
-    headerForm: UseFormReturn<TFieldValues>;
+    form: UseFormReturn<TFieldValues>;
+    onSubmit?: (values: TFieldValues) => void;
     searchField: FormFiltersProps<TFieldValues>['searchField'];
     mainFilters: FormFiltersProps<TFieldValues>['mainFilters'];
     submitButton: FormFiltersProps<TFieldValues>['submitButton'];
-    counter: number;
-    onSubmit: (submittedValues: TFieldValues) => void;
+    secondaryFilters: FormFiltersProps<TFieldValues>['secondaryFilters'];
     onOpenModal: () => void;
     dialogProps: FormFiltersDialogProps<TFieldValues>;
     mainFiltersColumns?: string;
     isLoading?: boolean;
-    allFiltersButtonClassName: string;
 };
-export declare const useLogic: <TFieldValues extends Record<string, unknown>>({ validationSchema, values, onChange, searchField, mainFilters, secondaryFilters, submitButton, mainFiltersColumns, isLoading, }: FormFiltersProps<TFieldValues>) => UseLogicReturn<TFieldValues>;
+export declare const useLogic: <TFieldValues extends Record<string, unknown>>({ form, onSubmit, validationSchema, searchField, mainFilters, secondaryFilters, submitButton, mainFiltersColumns, isLoading, }: FormFiltersProps<TFieldValues>) => UseLogicReturn<TFieldValues>;
 export {};

package/node/hook-form/FormFilters/useLogic/useLogic.js

@@ -1,124 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useLogic = void 0;
-const debounce_1 = require("@astral/utils/debounce");
 const react_1 = require("react");
-const react_hook_form_1 = require("react-hook-form");
-const checkIsDeepEqual_1 = require("../../../components/utils/checkIsDeepEqual");
-const classNames_1 = require("../../../components/utils/classNames");
-const constants_1 = require("../../FormFiltersSearchField/constants");
-const useForm_1 = require("../../useForm");
-const constants_2 = require("../constants");
-const hooks_1 = require("./hooks");
-const useLogic = ({ validationSchema, values, onChange, searchField, mainFilters, secondaryFilters, submitButton, mainFiltersColumns, isLoading, }) => {
+const useLogic = ({ form, onSubmit, validationSchema, searchField, mainFilters, secondaryFilters, submitButton, mainFiltersColumns, isLoading, }) => {
     const [isModalOpen, setIsModalOpen] = (0, react_1.useState)(false);
-    const isFirstMount = (0, hooks_1.useFirstMountAfterLoading)(isLoading);
     const onOpenModal = () => {
         setIsModalOpen(true);
     };
-    const headerForm = (0, useForm_1.useForm)({
-        validationSchema,
-        defaultValues: values,
-    });
-    const headerFormValues = (0, react_hook_form_1.useWatch)({
-        control: headerForm.control,
-    });
-    // Ref для хранения debounced функции, чтобы можно было её отменить
-    const debouncedOnChangeRef = (0, react_1.useRef)(null);
-    // Ref для отслеживания внешнего reset (чтобы не вызывать onChange при внешнем reset)
-    const isExternalResetRef = (0, react_1.useRef)(false);
-    // Ref для хранения предыдущих внешних values (для сравнения)
-    const previousValuesRef = (0, react_1.useRef)(values);
-    // Отменяет предыдущий debounced вызов onChange, если он есть
-    const clearPreviousDebouncedOnChange = () => {
-        if (debouncedOnChangeRef.current) {
-            debouncedOnChangeRef.current.clear();
-        }
-    };
-    const hasSubmitButton = Boolean(submitButton);
-    (0, react_1.useEffect)(() => {
-        // Если есть submitButton, не вызываем onChange при изменении значений
-        if (hasSubmitButton || isLoading || isFirstMount) {
-            return;
-        }
-        clearPreviousDebouncedOnChange();
-        // Пропускаем onChange если это внешний reset
-        if (isExternalResetRef.current) {
-            isExternalResetRef.current = false;
-            return;
-        }
-        // Создаем новый debounced вызов
-        const debouncedOnChange = (0, debounce_1.debounce)(() => {
-            onChange(headerFormValues);
-        }, 300);
-        debouncedOnChangeRef.current = debouncedOnChange;
-        debouncedOnChange();
-        return () => {
-            debouncedOnChange.clear();
-        };
-    }, [headerFormValues, onChange, hasSubmitButton, isLoading]);
-    const searchName = document
-        .getElementById(constants_1.FORM_FILTERS_SEARCH_FIELD_ID)
-        ?.getAttribute('name') || '';
-    // Исключаем поиск из счетчика фильтров
-    const counter = Object.values(headerFormValues).filter(Boolean).length -
-        (headerFormValues[searchName] ? 1 : 0);
-    const setFiltersValues = (newValues) => headerForm.reset(newValues);
-    // Функция отправки формы на SubmitButton. Приводит к вызову onChange без debounce.
-    const onSubmit = (submittedValues) => {
-        clearPreviousDebouncedOnChange();
-        onChange?.(submittedValues);
-    };
     // Функция отправки формы на кнопку "Применить" в модальном окне
     const onSubmitModal = (submittedValues) => {
-        setFiltersValues(submittedValues);
-        onSubmit(submittedValues);
+        form.reset(submittedValues);
     };
-    // Синхронизация внешних values с формой
-    (0, react_1.useEffect)(() => {
-        if (isFirstMount) {
-            return;
-        }
-        // Сравниваем значения, чтобы избежать лишних reset
-        const valuesChanged = !(0, checkIsDeepEqual_1.checkIsDeepEqual)(previousValuesRef.current, values);
-        if (!valuesChanged) {
-            return;
-        }
-        clearPreviousDebouncedOnChange();
-        isExternalResetRef.current = true;
-        previousValuesRef.current = values;
-        setFiltersValues(values);
-    }, [values, headerForm]);
-    const allFiltersButtonClassName = (0, react_1.useMemo)(() => {
-        return (0, classNames_1.classNames)({
-            [constants_2.formFiltersClassnames.showAllFiltersButtonOnDesktop]: Boolean(secondaryFilters),
-            [constants_2.formFiltersClassnames.showAllFiltersButtonOnMobile]: Boolean(mainFilters) || Boolean(secondaryFilters),
-            [constants_2.formFiltersClassnames.withSearch]: Boolean(searchField),
-            [constants_2.formFiltersClassnames.withoutSearch]: !searchField,
-        });
-    }, [mainFilters, secondaryFilters, searchField]);
     const dialogProps = {
         validationSchema,
-        values,
+        form,
         mainFilters,
         secondaryFilters,
-        defaultValues: headerFormValues,
         onSubmit: onSubmitModal,
         isModalOpen,
         setIsModalOpen,
     };
     return {
-        headerForm,
+        form,
+        onSubmit,
         searchField,
         mainFilters,
+        secondaryFilters,
         submitButton,
-        counter,
-        onSubmit,
         onOpenModal,
         dialogProps,
         mainFiltersColumns,
         isLoading,
-        allFiltersButtonClassName,
     };
 };
 exports.useLogic = useLogic;

package/node/hook-form/FormFiltersSearchField/FormFiltersSearchField.js

@@ -15,6 +15,6 @@ function FormFiltersSearchFieldInner({ width, ...props }, ref) {
         ...props,
         defaultValue: props.defaultValue || '',
     });
-    return ((0, jsx_runtime_1.jsx)(styles_1.Wrapper, { "$width": width, children: (0, jsx_runtime_1.jsx)(SearchField_1.SearchField, { ...fieldProps, ref: ref, inputProps: { id: constants_1.FORM_FILTERS_SEARCH_FIELD_ID } }) }));
+    return ((0, jsx_runtime_1.jsx)(styles_1.Wrapper, { "$width": width, children: (0, jsx_runtime_1.jsx)(SearchField_1.SearchField, { ...fieldProps, ref: ref, inputProps: { id: constants_1.FORM_FILTERS_SEARCH_FIELD_ID }, fullWidth: true }) }));
 }
 exports.FormFiltersSearchField = (0, forwardRefWithGeneric_1.forwardRefWithGeneric)(FormFiltersSearchFieldInner);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astral/ui",
-  "version": "4.29.0",
+  "version": "4.31.0",
   "browser": "./index.js",
   "main": "./node/index.js",
   "dependencies": {