@astral/ui 4.54.0 → 4.55.1

package/components/CardGridInfinite/CardGridInfinite.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { forwardRef, useMemo } from 'react';
-import { VirtuosoGrid, } from 'react-virtuoso';
+import { Virtuoso, VirtuosoGrid, } from 'react-virtuoso';
 import { ContentState } from '../ContentState';
 import { Card } from './Card';
 import { cardGridClassnames } from './constants';
@@ -12,10 +12,23 @@ import { SkeletonGrid } from './SkeletonGrid';
 import { ContentStateWrapper } from './styles';
 import { useLogic } from './useLogic';
 export const CardGridInfinite = (props) => {
-    const { contentStateProps, desktopCardWidth, virtuosoProps, scrollParent, skeleton, footerProps, onTopButtonProps, list, noDataImgSrc, defineCard, classnames, } = useLogic(props);
+    const { contentStateProps, desktopCardWidth, virtuosoProps, scrollParent, skeleton, footerProps, onTopButtonProps, list, noDataImgSrc, defineCard, classnames, isMobile, } = useLogic(props);
     const VirtuosoList = useMemo(() => forwardRef((listProps, ref) => (_jsx(List, { ...listProps, ref: ref, desktopCardWidth: desktopCardWidth }))), [desktopCardWidth]);
-    return (_jsx(ContentStateWrapper, { className: classnames, children: _jsx(ContentState, { ...contentStateProps, loadingContent: _jsx(SkeletonGrid, { skeleton: skeleton, desktopCardWidth: desktopCardWidth }), children: list?.length && scrollParent ? (_jsxs(_Fragment, { children: [_jsx(VirtuosoGrid, { ...virtuosoProps, data: list, customScrollParent: scrollParent, listClassName: cardGridClassnames.list, components: {
-                            List: VirtuosoList,
-                            Footer: () => _jsx(Footer, { ...footerProps }),
-                        }, itemContent: (_, item) => (_jsx(Card, { item: item, ...defineCard(item) })) }), _jsx(OnTopButton, { ...onTopButtonProps })] })) : (_jsx(NoDataPlaceholder, { noDataImgSrc: noDataImgSrc })) }) }));
+    const renderVirtuoso = () => {
+        if (!scrollParent) {
+            return null;
+        }
+        // VirtuosoGrid не поддерживает работу со списком без grid сетки (на мобиле обычный список) когда высота item разная
+        if (isMobile) {
+            return (_jsx(Virtuoso, { ...virtuosoProps, data: list, customScrollParent: scrollParent, components: {
+                    List: VirtuosoList,
+                    Footer: () => _jsx(Footer, { ...footerProps }),
+                }, itemContent: (_, item) => _jsx(Card, { item: item, ...defineCard(item) }) }));
+        }
+        return (_jsx(VirtuosoGrid, { ...virtuosoProps, data: list, customScrollParent: scrollParent, listClassName: cardGridClassnames.list, components: {
+                List: VirtuosoList,
+                Footer: () => _jsx(Footer, { ...footerProps }),
+            }, itemContent: (_, item) => _jsx(Card, { item: item, ...defineCard(item) }) }));
+    };
+    return (_jsx(ContentStateWrapper, { className: classnames, children: _jsx(ContentState, { ...contentStateProps, loadingContent: _jsx(SkeletonGrid, { skeleton: skeleton, desktopCardWidth: desktopCardWidth }), children: list?.length ? (_jsxs(_Fragment, { children: [renderVirtuoso(), _jsx(OnTopButton, { ...onTopButtonProps })] })) : (_jsx(NoDataPlaceholder, { noDataImgSrc: noDataImgSrc })) }) }));
 };

package/components/CardGridInfinite/useLogic/useLogic.d.ts

@@ -31,6 +31,7 @@ export declare const useLogic: <TDataItem extends Record<string, unknown>>({ lis
         handleScrollToTop: () => void;
         scrollRef: import("react").RefObject<HTMLElement | null>;
     };
+    isMobile: boolean;
     scrollParent: HTMLElement | null;
     skeleton: import("../types").SkeletonConfig;
     list: TDataItem[] | undefined;

package/components/CardGridInfinite/useLogic/useLogic.js

@@ -65,6 +65,7 @@ export const useLogic = ({ list, isLoading, isError, errorMsg, errorImgSrc, scro
             handleScrollToTop,
             scrollRef,
         },
+        isMobile,
         scrollParent,
         skeleton,
         list,

package/components/fileUploading/hooks/usePreviewFileUploader/usePreviewFileUploader.d.ts

@@ -106,6 +106,10 @@ export type UsePreviewFileUploaderParams = {
      * }
      */
     onView?: (fileId: FileId, file?: File, fileUrl?: string) => void;
+    /**
+     * Функция, позволяющая задавать кастомный текст ошибки
+     */
+    getErrorMessage?: (fileId: FileId, error: Error) => string;
     /**
      * Функция, вызываемая при изменении списка файлов (добавление/удаление)
      * @param value - Объект загруженного файла или null при удалении
@@ -133,7 +137,7 @@ export type UsePreviewFileUploaderParams = {
      */
     PdfViewer?: ((props: PdfViewerProps) => ReactElement) | LazyExoticComponent<(props: PdfViewerProps) => ReactElement>;
 };
-export declare const usePreviewFileUploader: ({ value, isDisabled, accept, restrictions, maxFileSize, inputRef, notify, onChange, onUploadFile, onDeleteFile, label, isError, generateDownloadLink, onView, name, helperText, className, placeholder, placeholderImgSrc, isHidePersonalData, PdfViewer, }: UsePreviewFileUploaderParams) => {
+export declare const usePreviewFileUploader: ({ value, isDisabled, accept, restrictions, maxFileSize, inputRef, notify, onChange, onUploadFile, onDeleteFile, label, isError, generateDownloadLink, onView, getErrorMessage, name, helperText, className, placeholder, placeholderImgSrc, isHidePersonalData, PdfViewer, }: UsePreviewFileUploaderParams) => {
     dropZoneProps: {
         isVisibleAddFile: boolean;
         isVisibleFileList: boolean;

package/components/fileUploading/hooks/usePreviewFileUploader/usePreviewFileUploader.js

@@ -10,7 +10,7 @@ import { rulePipe } from '../../utils/rulePipe';
 import { toArray } from '../../utils/toArray';
 import { useDnD } from '../useDnD';
 import { useUploadFiles } from '../useUploadFiles';
-export const usePreviewFileUploader = ({ value, isDisabled, accept, restrictions = [], maxFileSize, inputRef, notify, onChange, onUploadFile, onDeleteFile, label, isError, generateDownloadLink, onView, name, helperText, className, placeholder, placeholderImgSrc, isHidePersonalData, PdfViewer, }) => {
+export const usePreviewFileUploader = ({ value, isDisabled, accept, restrictions = [], maxFileSize, inputRef, notify, onChange, onUploadFile, onDeleteFile, label, isError, generateDownloadLink, onView, getErrorMessage, name, helperText, className, placeholder, placeholderImgSrc, isHidePersonalData, PdfViewer, }) => {
     const inputId = useId();
     const [deletingFileId, setDeletingFileId] = useState(null);
     const { generateId } = useGenerateLocalId();
@@ -46,6 +46,7 @@ export const usePreviewFileUploader = ({ value, isDisabled, accept, restrictions
         files,
         onChange,
         onUploadFile,
+        getErrorMessage,
     });
     const handleChange = (event) => {
         // Преобразуем к массиву и удаляем дубликаты

package/node/components/CardGridInfinite/CardGridInfinite.js

@@ -15,11 +15,24 @@ const SkeletonGrid_1 = require("./SkeletonGrid");
 const styles_1 = require("./styles");
 const useLogic_1 = require("./useLogic");
 const CardGridInfinite = (props) => {
-    const { contentStateProps, desktopCardWidth, virtuosoProps, scrollParent, skeleton, footerProps, onTopButtonProps, list, noDataImgSrc, defineCard, classnames, } = (0, useLogic_1.useLogic)(props);
+    const { contentStateProps, desktopCardWidth, virtuosoProps, scrollParent, skeleton, footerProps, onTopButtonProps, list, noDataImgSrc, defineCard, classnames, isMobile, } = (0, useLogic_1.useLogic)(props);
     const VirtuosoList = (0, react_1.useMemo)(() => (0, react_1.forwardRef)((listProps, ref) => ((0, jsx_runtime_1.jsx)(List_1.List, { ...listProps, ref: ref, desktopCardWidth: desktopCardWidth }))), [desktopCardWidth]);
-    return ((0, jsx_runtime_1.jsx)(styles_1.ContentStateWrapper, { className: classnames, children: (0, jsx_runtime_1.jsx)(ContentState_1.ContentState, { ...contentStateProps, loadingContent: (0, jsx_runtime_1.jsx)(SkeletonGrid_1.SkeletonGrid, { skeleton: skeleton, desktopCardWidth: desktopCardWidth }), children: list?.length && scrollParent ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(react_virtuoso_1.VirtuosoGrid, { ...virtuosoProps, data: list, customScrollParent: scrollParent, listClassName: constants_1.cardGridClassnames.list, components: {
-                            List: VirtuosoList,
-                            Footer: () => (0, jsx_runtime_1.jsx)(Footer_1.Footer, { ...footerProps }),
-                        }, itemContent: (_, item) => ((0, jsx_runtime_1.jsx)(Card_1.Card, { item: item, ...defineCard(item) })) }), (0, jsx_runtime_1.jsx)(OnTopButton_1.OnTopButton, { ...onTopButtonProps })] })) : ((0, jsx_runtime_1.jsx)(NoDataPlaceholder_1.NoDataPlaceholder, { noDataImgSrc: noDataImgSrc })) }) }));
+    const renderVirtuoso = () => {
+        if (!scrollParent) {
+            return null;
+        }
+        // VirtuosoGrid не поддерживает работу со списком без grid сетки (на мобиле обычный список) когда высота item разная
+        if (isMobile) {
+            return ((0, jsx_runtime_1.jsx)(react_virtuoso_1.Virtuoso, { ...virtuosoProps, data: list, customScrollParent: scrollParent, components: {
+                    List: VirtuosoList,
+                    Footer: () => (0, jsx_runtime_1.jsx)(Footer_1.Footer, { ...footerProps }),
+                }, itemContent: (_, item) => (0, jsx_runtime_1.jsx)(Card_1.Card, { item: item, ...defineCard(item) }) }));
+        }
+        return ((0, jsx_runtime_1.jsx)(react_virtuoso_1.VirtuosoGrid, { ...virtuosoProps, data: list, customScrollParent: scrollParent, listClassName: constants_1.cardGridClassnames.list, components: {
+                List: VirtuosoList,
+                Footer: () => (0, jsx_runtime_1.jsx)(Footer_1.Footer, { ...footerProps }),
+            }, itemContent: (_, item) => (0, jsx_runtime_1.jsx)(Card_1.Card, { item: item, ...defineCard(item) }) }));
+    };
+    return ((0, jsx_runtime_1.jsx)(styles_1.ContentStateWrapper, { className: classnames, children: (0, jsx_runtime_1.jsx)(ContentState_1.ContentState, { ...contentStateProps, loadingContent: (0, jsx_runtime_1.jsx)(SkeletonGrid_1.SkeletonGrid, { skeleton: skeleton, desktopCardWidth: desktopCardWidth }), children: list?.length ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [renderVirtuoso(), (0, jsx_runtime_1.jsx)(OnTopButton_1.OnTopButton, { ...onTopButtonProps })] })) : ((0, jsx_runtime_1.jsx)(NoDataPlaceholder_1.NoDataPlaceholder, { noDataImgSrc: noDataImgSrc })) }) }));
 };
 exports.CardGridInfinite = CardGridInfinite;

package/node/components/CardGridInfinite/useLogic/useLogic.d.ts

@@ -31,6 +31,7 @@ export declare const useLogic: <TDataItem extends Record<string, unknown>>({ lis
         handleScrollToTop: () => void;
         scrollRef: import("react").RefObject<HTMLElement | null>;
     };
+    isMobile: boolean;
     scrollParent: HTMLElement | null;
     skeleton: import("../types").SkeletonConfig;
     list: TDataItem[] | undefined;

package/node/components/CardGridInfinite/useLogic/useLogic.js

@@ -68,6 +68,7 @@ const useLogic = ({ list, isLoading, isError, errorMsg, errorImgSrc, scrollRef,
             handleScrollToTop,
             scrollRef,
         },
+        isMobile,
         scrollParent,
         skeleton,
         list,

package/node/components/fileUploading/hooks/usePreviewFileUploader/usePreviewFileUploader.d.ts

@@ -106,6 +106,10 @@ export type UsePreviewFileUploaderParams = {
      * }
      */
     onView?: (fileId: FileId, file?: File, fileUrl?: string) => void;
+    /**
+     * Функция, позволяющая задавать кастомный текст ошибки
+     */
+    getErrorMessage?: (fileId: FileId, error: Error) => string;
     /**
      * Функция, вызываемая при изменении списка файлов (добавление/удаление)
      * @param value - Объект загруженного файла или null при удалении
@@ -133,7 +137,7 @@ export type UsePreviewFileUploaderParams = {
      */
     PdfViewer?: ((props: PdfViewerProps) => ReactElement) | LazyExoticComponent<(props: PdfViewerProps) => ReactElement>;
 };
-export declare const usePreviewFileUploader: ({ value, isDisabled, accept, restrictions, maxFileSize, inputRef, notify, onChange, onUploadFile, onDeleteFile, label, isError, generateDownloadLink, onView, name, helperText, className, placeholder, placeholderImgSrc, isHidePersonalData, PdfViewer, }: UsePreviewFileUploaderParams) => {
+export declare const usePreviewFileUploader: ({ value, isDisabled, accept, restrictions, maxFileSize, inputRef, notify, onChange, onUploadFile, onDeleteFile, label, isError, generateDownloadLink, onView, getErrorMessage, name, helperText, className, placeholder, placeholderImgSrc, isHidePersonalData, PdfViewer, }: UsePreviewFileUploaderParams) => {
     dropZoneProps: {
         isVisibleAddFile: boolean;
         isVisibleFileList: boolean;

package/node/components/fileUploading/hooks/usePreviewFileUploader/usePreviewFileUploader.js

@@ -13,7 +13,7 @@ const rulePipe_1 = require("../../utils/rulePipe");
 const toArray_1 = require("../../utils/toArray");
 const useDnD_1 = require("../useDnD");
 const useUploadFiles_1 = require("../useUploadFiles");
-const usePreviewFileUploader = ({ value, isDisabled, accept, restrictions = [], maxFileSize, inputRef, notify, onChange, onUploadFile, onDeleteFile, label, isError, generateDownloadLink, onView, name, helperText, className, placeholder, placeholderImgSrc, isHidePersonalData, PdfViewer, }) => {
+const usePreviewFileUploader = ({ value, isDisabled, accept, restrictions = [], maxFileSize, inputRef, notify, onChange, onUploadFile, onDeleteFile, label, isError, generateDownloadLink, onView, getErrorMessage, name, helperText, className, placeholder, placeholderImgSrc, isHidePersonalData, PdfViewer, }) => {
     const inputId = (0, useId_1.useId)();
     const [deletingFileId, setDeletingFileId] = (0, react_1.useState)(null);
     const { generateId } = (0, useGenerateLocalId_1.useGenerateLocalId)();
@@ -49,6 +49,7 @@ const usePreviewFileUploader = ({ value, isDisabled, accept, restrictions = [],
         files,
         onChange,
         onUploadFile,
+        getErrorMessage,
     });
     const handleChange = (event) => {
         // Преобразуем к массиву и удаляем дубликаты

package/package.json

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