@astral/ui 4.29.0 → 4.30.0

package/node/components/Filename/styles.d.ts

@@ -3,6 +3,10 @@ export declare const FileBaseName: import("@emotion/styled/dist/declarations/src
     theme?: import("@emotion/react").Theme | undefined;
     as?: import("react").ElementType<any, keyof import("react").JSX.IntrinsicElements> | undefined;
 }, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, {}>;
+export declare const FileSuffix: 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<HTMLSpanElement>, HTMLSpanElement>, {}>;
 export declare const StyledTypography: import("@emotion/styled/dist/declarations/src/types").StyledComponent<import("../Typography/types").TypographyPropsBase & {
     color?: import("../Typography").TypographyColor | undefined;
     variant?: import("../Typography").TypographyVariant | undefined;

package/node/components/Filename/styles.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StyledTypography = exports.FileBaseName = void 0;
+exports.StyledTypography = exports.FileSuffix = exports.FileBaseName = void 0;
 const styled_1 = require("../styled");
 const Typography_1 = require("../Typography");
 exports.FileBaseName = styled_1.styled.span `
@@ -9,7 +9,10 @@ exports.FileBaseName = styled_1.styled.span `
   max-width: 100%;
 
   text-overflow: ellipsis;
-  white-space: nowrap;
+  white-space: preserve nowrap;
+`;
+exports.FileSuffix = styled_1.styled.span `
+  white-space: pre;
 `;
 exports.StyledTypography = (0, styled_1.styled)(Typography_1.Typography, {
     shouldForwardProp: (prop) => !['$align'].includes(prop),

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

@@ -0,0 +1,2 @@
+import { type AllFiltersButtonProps } from './types';
+export declare const AllFiltersButton: <TFieldValues extends Record<string, unknown>>(props: AllFiltersButtonProps<TFieldValues>) => import("react/jsx-runtime").JSX.Element;

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

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AllFiltersButton = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const Button_1 = require("../../../components/Button");
+const Filter2OutlineMd_1 = require("../../../icons/Filter2OutlineMd");
+const constants_1 = require("../constants");
+const styles_1 = require("./styles");
+const useLogic_1 = require("./useLogic");
+const AllFiltersButton = (props) => {
+    const { allFiltersButtonClassName, counter, onOpenModal } = (0, useLogic_1.useLogic)(props);
+    return ((0, jsx_runtime_1.jsx)(styles_1.AllFiltersButtonWrapper, { className: allFiltersButtonClassName, children: (0, jsx_runtime_1.jsx)(styles_1.StyledBadge, { color: "error", badgeContent: counter, variant: "dot", children: (0, jsx_runtime_1.jsx)(Button_1.Button, { onClick: onOpenModal, variant: "outlined", color: "grey", startIcon: (0, jsx_runtime_1.jsx)(Filter2OutlineMd_1.Filter2OutlineMd, {}), endIcon: counter ? (0, jsx_runtime_1.jsx)(styles_1.StyledCounter, { color: "error", content: counter }) : null, className: constants_1.formFiltersClassnames.allFiltersButton, children: "\u0412\u0441\u0435 \u0444\u0438\u043B\u044C\u0442\u0440\u044B" }) }) }));
+};
+exports.AllFiltersButton = AllFiltersButton;

package/node/hook-form/FormFilters/AllFiltersButton/index.d.ts

@@ -0,0 +1 @@
+export { AllFiltersButton } from './AllFiltersButton';

package/node/hook-form/FormFilters/AllFiltersButton/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AllFiltersButton = void 0;
+var AllFiltersButton_1 = require("./AllFiltersButton");
+Object.defineProperty(exports, "AllFiltersButton", { enumerable: true, get: function () { return AllFiltersButton_1.AllFiltersButton; } });

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

@@ -0,0 +1,19 @@
+/// <reference types="react" />
+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 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;
+}, {}, {}>;

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

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StyledCounter = exports.StyledBadge = exports.AllFiltersButtonWrapper = void 0;
+const Badge_1 = require("@mui/material/Badge");
+const Badge_2 = require("../../../components/Badge");
+const Counter_1 = require("../../../components/Counter");
+const styled_1 = require("../../../components/styled");
+const constants_1 = require("../constants");
+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.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;
+  }
+`;

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

@@ -0,0 +1,8 @@
+import { type UseFormReturn } from 'react-hook-form';
+export type AllFiltersButtonProps<TFieldValues extends Record<string, unknown>> = {
+    form: UseFormReturn<TFieldValues>;
+    onOpenModal: () => void;
+    hasMainFilters: boolean;
+    hasSecondaryFilters: boolean;
+    hasSearch: boolean;
+};

package/node/hook-form/FormFilters/AllFiltersButton/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -0,0 +1 @@
+export * from './useLogic';

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

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./useLogic"), exports);

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

@@ -0,0 +1,6 @@
+import { type AllFiltersButtonProps } from '../types';
+export declare const useLogic: <TFieldValues extends Record<string, unknown>>({ form, onOpenModal, hasMainFilters, hasSecondaryFilters, hasSearch, }: AllFiltersButtonProps<TFieldValues>) => {
+    allFiltersButtonClassName: string;
+    counter: number;
+    onOpenModal: () => void;
+};

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

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useLogic = void 0;
+const react_1 = require("react");
+const react_hook_form_1 = require("react-hook-form");
+const classNames_1 = require("../../../../components/utils/classNames");
+const constants_1 = require("../../../FormFiltersSearchField/constants");
+const constants_2 = require("../../constants");
+const useLogic = ({ form, onOpenModal, hasMainFilters, hasSecondaryFilters, hasSearch, }) => {
+    const formValues = (0, react_hook_form_1.useWatch)({
+        control: form.control,
+    });
+    const [searchName, setSearchName] = (0, react_1.useState)('');
+    (0, react_1.useEffect)(() => {
+        const searchFieldName = document
+            .getElementById(constants_1.FORM_FILTERS_SEARCH_FIELD_ID)
+            ?.getAttribute('name') || '';
+        setSearchName(searchFieldName);
+    }, [hasSearch]);
+    // Исключаем поиск из счетчика фильтров
+    const counter = Object.values(formValues || {}).filter(Boolean).length -
+        (formValues?.[searchName] ? 1 : 0);
+    const allFiltersButtonClassName = (0, react_1.useMemo)(() => {
+        return (0, classNames_1.classNames)({
+            [constants_2.formFiltersClassnames.showAllFiltersButtonOnDesktop]: hasSecondaryFilters,
+            [constants_2.formFiltersClassnames.showAllFiltersButtonOnMobile]: hasMainFilters || hasSecondaryFilters,
+            [constants_2.formFiltersClassnames.withSearch]: hasSearch,
+            [constants_2.formFiltersClassnames.withoutSearch]: !hasSearch,
+        });
+    }, [hasMainFilters, hasSecondaryFilters, hasSearch]);
+    return {
+        allFiltersButtonClassName,
+        counter,
+        onOpenModal,
+    };
+};
+exports.useLogic = useLogic;

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

@@ -2,10 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FormFilters = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
-const Button_1 = require("../../components/Button");
-const Filter2OutlineMd_1 = require("../../icons/Filter2OutlineMd");
 const Form_1 = require("../Form");
 const FormControlProvider_1 = require("../FormControlProvider");
+const AllFiltersButton_1 = require("./AllFiltersButton");
 const constants_1 = require("./constants");
 const FormFiltersDialog_1 = require("./FormFiltersDialog");
 const FormFiltersSkeleton_1 = require("./FormFiltersSkeleton");
@@ -15,10 +14,10 @@ const useLogic_1 = require("./useLogic");
  * Компонент для отображения фильтров формы
  */
 const FormFilters = (props) => {
-    const { headerForm, searchField: SearchField, mainFilters: MainFilters, submitButton: SubmitButton, counter, onSubmit, onOpenModal, dialogProps, mainFiltersColumns, isLoading, allFiltersButtonClassName, } = (0, useLogic_1.useLogic)(props);
+    const { form, onSubmit, searchField: SearchField, mainFilters: MainFilters, submitButton: SubmitButton, secondaryFilters: SecondaryFilters, onOpenModal, dialogProps, mainFiltersColumns, isLoading, } = (0, useLogic_1.useLogic)(props);
     if (isLoading) {
         return (0, jsx_runtime_1.jsx)(FormFiltersSkeleton_1.FormFiltersSkeleton, {});
     }
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(FormControlProvider_1.FormControlProvider, { size: "small", hideHelperText: true, children: (0, jsx_runtime_1.jsx)(Form_1.Form, { form: headerForm, onSubmit: headerForm.handleSubmit(onSubmit), children: (0, jsx_runtime_1.jsxs)(styles_1.Wrapper, { children: [SearchField && ((0, jsx_runtime_1.jsx)(SearchField, { control: headerForm.control, fullWidth: true })), (0, jsx_runtime_1.jsx)(styles_1.AllFiltersButtonWrapper, { className: allFiltersButtonClassName, children: (0, jsx_runtime_1.jsx)(styles_1.StyledBadge, { color: "error", badgeContent: counter, variant: "dot", children: (0, jsx_runtime_1.jsx)(Button_1.Button, { onClick: onOpenModal, variant: "outlined", color: "grey", startIcon: (0, jsx_runtime_1.jsx)(Filter2OutlineMd_1.Filter2OutlineMd, {}), endIcon: counter ? ((0, jsx_runtime_1.jsx)(styles_1.StyledCounter, { color: "error", content: counter })) : null, className: constants_1.formFiltersClassnames.allFiltersButton, children: "\u0412\u0441\u0435 \u0444\u0438\u043B\u044C\u0442\u0440\u044B" }) }) }), (0, jsx_runtime_1.jsx)(styles_1.MainFiltersWrapper, { className: constants_1.formFiltersClassnames.pageHeaderFilters, columns: mainFiltersColumns, children: MainFilters && ((0, jsx_runtime_1.jsx)(MainFilters, { control: headerForm.control, isModal: false })) }), SubmitButton && ((0, jsx_runtime_1.jsx)(styles_1.SubmitButtonWrapper, { children: (0, jsx_runtime_1.jsx)(SubmitButton, { size: "medium", className: constants_1.formFiltersClassnames.submitButton }) }))] }) }) }), (0, jsx_runtime_1.jsx)(FormFiltersDialog_1.FormFiltersDialog, { ...dialogProps })] }));
+    return ((0, jsx_runtime_1.jsxs)(Form_1.Form, { name: "form", form: form, onSubmit: form.handleSubmit(onSubmit || (() => undefined)), children: [(0, jsx_runtime_1.jsx)(FormControlProvider_1.FormControlProvider, { size: "small", hideHelperText: true, children: (0, jsx_runtime_1.jsxs)(styles_1.Wrapper, { children: [SearchField && (0, jsx_runtime_1.jsx)(SearchField, { control: form.control }), (0, jsx_runtime_1.jsx)(AllFiltersButton_1.AllFiltersButton, { form: form, onOpenModal: onOpenModal, hasMainFilters: Boolean(MainFilters), hasSecondaryFilters: Boolean(SecondaryFilters), hasSearch: Boolean(SearchField) }), (0, jsx_runtime_1.jsx)(styles_1.MainFiltersWrapper, { columns: mainFiltersColumns, children: MainFilters && ((0, jsx_runtime_1.jsx)(MainFilters, { control: form.control, isModal: false })) }), SubmitButton && ((0, jsx_runtime_1.jsx)(styles_1.SubmitButtonWrapper, { children: (0, jsx_runtime_1.jsx)(SubmitButton, { size: "medium", className: constants_1.formFiltersClassnames.submitButton }) }))] }) }), (0, jsx_runtime_1.jsx)(FormFiltersDialog_1.FormFiltersDialog, { ...dialogProps })] }));
 };
 exports.FormFilters = FormFilters;

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

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { type FormFiltersDialogProps } from '../types';
-export declare const useLogic: <TFieldValues extends Record<string, unknown>>({ validationSchema, values, mainFilters, secondaryFilters, isModalOpen, setIsModalOpen, defaultValues, onSubmit, }: FormFiltersDialogProps<TFieldValues>) => {
+export declare const useLogic: <TFieldValues extends Record<string, unknown>>({ validationSchema, mainFilters, secondaryFilters, isModalOpen, setIsModalOpen, onSubmit, form, }: FormFiltersDialogProps<TFieldValues>) => {
     modalForm: import("react-hook-form").UseFormReturn<TFieldValues, any>;
     onCloseModal: () => void;
     onResetModal: () => void;

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

@@ -3,17 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useLogic = void 0;
 const react_1 = require("react");
 const useForm_1 = require("../../../useForm");
-const useLogic = ({ validationSchema, values, mainFilters, secondaryFilters, isModalOpen, setIsModalOpen, defaultValues, onSubmit, }) => {
+const useLogic = ({ validationSchema, mainFilters, secondaryFilters, isModalOpen, setIsModalOpen, onSubmit, form, }) => {
     const modalForm = (0, useForm_1.useForm)({
         validationSchema,
-        defaultValues: values,
+        defaultValues: form.getValues(),
     });
     const onCloseModal = () => {
         setIsModalOpen(false);
         modalForm.reset();
     };
     const onResetModal = () => {
-        modalForm.reset(defaultValues);
+        modalForm.reset(form.getValues());
     };
     const onSubmitModal = (submittedValues) => {
         onSubmit(submittedValues);
@@ -21,13 +21,10 @@ const useLogic = ({ validationSchema, values, mainFilters, secondaryFilters, isM
     };
     const isResetButtonDisabled = !modalForm.formState.isDirty;
     (0, react_1.useEffect)(() => {
-        if (isModalOpen && defaultValues) {
+        if (isModalOpen) {
             onResetModal();
         }
     }, [isModalOpen]);
-    (0, react_1.useEffect)(() => {
-        modalForm.reset(values);
-    }, [values]);
     return {
         modalForm,
         onCloseModal,

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

@@ -1,6 +1,5 @@
 export declare const formFiltersClassnames: {
     modalFilters: string;
-    pageHeaderFilters: string;
     submitButton: string;
     allFiltersButton: string;
     showAllFiltersButtonOnDesktop: string;

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

@@ -4,7 +4,6 @@ exports.formFiltersClassnames = void 0;
 const createUIKitClassname_1 = require("../../components/utils/createUIKitClassname");
 exports.formFiltersClassnames = {
     modalFilters: (0, createUIKitClassname_1.createUIKitClassname)('form-filters__modal-filters'),
-    pageHeaderFilters: (0, createUIKitClassname_1.createUIKitClassname)('form-filters__page-header-filters'),
     submitButton: (0, createUIKitClassname_1.createUIKitClassname)('form-filters__submit-button'),
     allFiltersButton: (0, createUIKitClassname_1.createUIKitClassname)('form-filters__all-filters-button'),
     showAllFiltersButtonOnDesktop: (0, createUIKitClassname_1.createUIKitClassname)('form-filters_show-all-filters-button_desktop'),

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;