@astral/ui 4.79.0 → 4.80.0

package/components/DataGridInfinite/DataGridInfinite.js

@@ -20,7 +20,7 @@ import { ErrorMessage } from './ErrorMessage';
 import { List } from './List';
 import { NoData } from './NoData';
 import { Row } from './Row';
-import { Backdrop, DataGridWrapper, DisabledDataGridWrapper, FooterRow, StyledContainer, StyledScrollToTopButton, } from './styles';
+import { Backdrop, DataGridWrapper, DisabledDataGridWrapper, FooterRow, HeaderRow, StyledContainer, StyledScrollToTopButton, } from './styles';
 import { useLogic } from './useLogic';
 const dataGridInfiniteCva = cva(dataGridClassnames.root, {
     variants: {
@@ -42,7 +42,7 @@ const dataGridInfiniteCva = cva(dataGridClassnames.root, {
 });
 export const DataGridInfinite = (props) => {
     const { imagesMap, emptySymbol } = useContext(ConfigContext);
-    const { isNoData, isDataGridDisabled, treeRenderConfig, virtuosoProps, headProps, rowProps, scrollToTopButtonProps, isEndReached, isHideHead, containerCssVars, isMobile, mobileSkeletonProps, hasGroupedColumns, gridViewMode, gridColumns, handleSelectRow, mobileDisplayVariant, isSelfContained, } = useLogic(props);
+    const { isNoData, isDataGridDisabled, treeRenderConfig, virtuosoProps, headProps, rowProps, scrollToTopButtonProps, isEndReached, isHideHead, containerCssVars, isMobile, mobileSkeletonProps, hasGroupedColumns, gridViewMode, gridColumns, handleSelectRow, mobileDisplayVariant, isSelfContained, isNotRenderHeader, initialTopMostItemIndex, } = useLogic(props);
     const { columns, rows = [], selectedRows = [], sorting, isLoading, isDisabled, keyId, emptyCellValue = emptySymbol, variant = Variant.Tree, subrows, className, isError, endOfScrollMsg, errorMsg, noDataPlaceholder, onRowClick, onSort, onRetry, headPreAddon, activeRowId, isTabularNums, renderRow, } = props;
     const { moreButtonColumnPosition = 1, isVisibleCollapseButton = true } = subrows || {};
     const { isInitialExpanded = false, expandedLevel = EXPANDED_LEVEL_BY_DEFAULT, initialVisibleChildrenCount = INITIAL_OPENED_NESTED_CHILDREN_COUNT_BY_DEFAULT, } = treeRenderConfig || {};
@@ -58,7 +58,9 @@ export const DataGridInfinite = (props) => {
                                     errorList: [errorMsg || ''],
                                     imgSrc: imagesMap.defaultErrorImgSrc,
                                     onRetry,
-                                }, children: _jsx(Virtuoso, { ...virtuosoProps, style: { height: '100%' }, overscan: OVERSCAN_COUNT, data: rows, components: {
+                                }, children: _jsx(Virtuoso, { ...virtuosoProps, ...(initialTopMostItemIndex && {
+                                        initialTopMostItemIndex,
+                                    }), style: { height: '100%' }, overscan: OVERSCAN_COUNT, data: rows, components: {
                                         // biome-ignore lint/suspicious/noTsIgnore: Требует HTMLDivElement, а для элемента списка используем HTMLUListElement (https://github.com/petyosi/react-virtuoso/issues/864)
                                         // @ts-ignore
                                         List,
@@ -70,5 +72,11 @@ export const DataGridInfinite = (props) => {
                                             }
                                             return (_jsxs(FooterRow, { children: [isLoading && _jsx(Loader, {}), isError && _jsx(ErrorMessage, { onRetry: onRetry }), isEndReached && (_jsx(EndData, { endOfScrollMsg: endOfScrollMsg }))] }));
                                         },
+                                        Header: () => {
+                                            if (isNotRenderHeader) {
+                                                return null;
+                                            }
+                                            return (_jsxs(HeaderRow, { children: [isLoading && _jsx(Loader, {}), isError && _jsx(ErrorMessage, { onRetry: onRetry })] }));
+                                        },
                                     } }) }), _jsx(StyledScrollToTopButton, { ...scrollToTopButtonProps, className: dataGridInfiniteClassnames.scrollToTopButton }), isDisabled && _jsx(Backdrop, {})] })] }) }) }));
 };

package/components/DataGridInfinite/Row/Row.js

@@ -6,5 +6,5 @@ import { useLogic } from './useLogic';
 const INITIAL_LEVEL = 0;
 export const Row = ({ children, ...props }) => {
     const { item, memoizedItemProps, onSelectRow, renderRow, flattenColumns, gridColumns, options, keyId, variant, isSelectable, isSelected, nestedChildren, isInitialExpanded, expandedLevel, initialVisibleChildrenCount, moreButtonColumnPosition, isVisibleCollapseButton, emptyCellValue, activeRowId, onRowClick, } = useLogic(props);
-    return (_jsx(RowContextProvider, { row: item, itemProps: memoizedItemProps, onSelectRow: onSelectRow, isSelectable: isSelectable, isSelected: isSelected, children: renderRow ? (_jsx(CustomRowWrapper, { index: memoizedItemProps['data-item-index'], renderRow: renderRow, row: item })) : (_jsx(RowComponent, { ...memoizedItemProps, row: item, columns: flattenColumns, gridColumns: gridColumns, options: options, keyId: keyId, variant: variant, isSelectable: isSelectable, isSelected: isSelected, level: INITIAL_LEVEL, nestedChildren: nestedChildren, isInitialExpanded: isInitialExpanded || false, expandedLevel: expandedLevel || 1, initialVisibleChildrenCount: initialVisibleChildrenCount || 2, activeRowId: activeRowId, moreButtonColumnPosition: moreButtonColumnPosition || 1, isVisibleCollapseButton: isVisibleCollapseButton || true, emptyCellValue: emptyCellValue, onRowClick: onRowClick, onSelectRow: onSelectRow })) }));
+    return (_jsx(RowContextProvider, { row: item, itemProps: memoizedItemProps, onSelectRow: onSelectRow, isSelectable: isSelectable, isSelected: isSelected, children: renderRow ? (_jsx(CustomRowWrapper, { index: memoizedItemProps['data-index'], renderRow: renderRow, row: item })) : (_jsx(RowComponent, { ...memoizedItemProps, row: item, columns: flattenColumns, gridColumns: gridColumns, options: options, keyId: keyId, variant: variant, isSelectable: isSelectable, isSelected: isSelected, level: INITIAL_LEVEL, nestedChildren: nestedChildren, isInitialExpanded: isInitialExpanded || false, expandedLevel: expandedLevel || 1, initialVisibleChildrenCount: initialVisibleChildrenCount || 2, activeRowId: activeRowId, moreButtonColumnPosition: moreButtonColumnPosition || 1, isVisibleCollapseButton: isVisibleCollapseButton || true, emptyCellValue: emptyCellValue, onRowClick: onRowClick, onSelectRow: onSelectRow })) }));
 };

package/components/DataGridInfinite/index.d.ts

@@ -1,2 +1,2 @@
 export { DataGridInfinite } from './DataGridInfinite';
-export type { DataGridInfiniteProps } from './types';
+export type { DataGridInfiniteProps, DataGridInfiniteVirtuosoHandle, DataGridInfiniteVirtuosoRef, } from './types';

package/components/DataGridInfinite/public.d.ts

@@ -1,2 +1,2 @@
 export { DataGridInfinite } from './DataGridInfinite';
-export type { DataGridInfiniteProps } from './types';
+export type { DataGridInfiniteProps, DataGridInfiniteVirtuosoHandle, DataGridInfiniteVirtuosoRef, } from './types';

package/components/DataGridInfinite/styles.d.ts

@@ -13,6 +13,10 @@ export declare const FooterRow: import("../styled").StyledComponent<{
     theme?: import("@emotion/react").Theme | undefined;
     as?: import("react").ElementType<any, keyof import("react").JSX.IntrinsicElements> | undefined;
 }, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLElement>, HTMLElement>, {}>;
+export declare const HeaderRow: import("../styled").StyledComponent<{
+    theme?: import("@emotion/react").Theme | undefined;
+    as?: import("react").ElementType<any, keyof import("react").JSX.IntrinsicElements> | undefined;
+}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLElement>, HTMLElement>, {}>;
 export declare const Backdrop: import("../styled").StyledComponent<{
     theme?: import("@emotion/react").Theme | undefined;
     as?: import("react").ElementType<any, keyof import("react").JSX.IntrinsicElements> | undefined;

package/components/DataGridInfinite/styles.js

@@ -26,6 +26,14 @@ export const FooterRow = styled.footer `
 
   min-height: 68px;
 `;
+export const HeaderRow = styled.header `
+  display: flex;
+  flex-shrink: 0;
+  align-items: center;
+  justify-content: center;
+
+  min-height: 68px;
+`;
 export const Backdrop = styled.div `
   position: absolute;
   top: 0;

package/components/DataGridInfinite/types.d.ts

@@ -1,6 +1,14 @@
+import { type Ref, type RefObject } from 'react';
+import { type VirtuosoHandle } from 'react-virtuoso';
 import type { DataGridProps, DataGridRow } from '../DataGrid';
 import { type CellValue } from '../DataGrid/types';
+export type DataGridInfiniteVirtuosoHandle = VirtuosoHandle;
+export type DataGridInfiniteVirtuosoRef = RefObject<DataGridInfiniteVirtuosoHandle | null>;
 export type DataGridInfiniteProps<TData extends Record<string, CellValue> = DataGridRow, TSortField extends keyof TData = keyof TData> = Omit<DataGridProps<TData, TSortField>, 'footer' | 'minDisplayRows'> & {
+    /**
+     * Ref для доступа к методам Virtuoso
+     */
+    virtuosoRef?: Ref<DataGridInfiniteVirtuosoHandle>;
     /**
      * Флаг достижения конца списка
      */
@@ -17,4 +25,16 @@ export type DataGridInfiniteProps<TData extends Record<string, CellValue> = Data
      * Убирает шапку таблицы, когда нет данных
      */
     isHideHeaderIfNoData?: boolean;
+    /**
+     * Обработчик подгрузки данных при скроле до начала списка
+     */
+    onStartReached?: () => void;
+    /**
+     * Флаг достижения начала списка
+     */
+    isStartReached?: boolean;
+    /**
+     * Индекс первого видимого элемента
+     */
+    initialVisibleItemIndex?: number;
 };

package/components/DataGridInfinite/useLogic/useLogic.d.ts

@@ -1,10 +1,10 @@
 import { type ChangeEvent } from 'react';
-import type { ListRange, VirtuosoHandle } from 'react-virtuoso';
+import type { ListRange } from 'react-virtuoso';
 import { type DataGridRow } from '../../DataGrid';
 import { type CellValue } from '../../DataGrid/types';
-import { type DataGridInfiniteProps } from '../types';
+import { type DataGridInfiniteProps, type DataGridInfiniteVirtuosoHandle } from '../types';
 type UseLogicParams<TData extends Record<string, CellValue> = DataGridRow, TSortField extends keyof TData = keyof TData> = DataGridInfiniteProps<TData, TSortField>;
-export declare const useLogic: <TData extends Record<string, unknown> = DataGridRow, TSortField extends keyof TData = keyof TData>({ keyId, columns, rows, variant, tree, subrows, selectedRows, maxHeight, isLoading, isDisabled, isEndReached, onEndReached, onSelectRow, isHideSelectAll, isHideHeaderIfNoData, gridViewMode: gridViewModeProp, mobileDisplayVariant, }: UseLogicParams<TData, TSortField>) => {
+export declare const useLogic: <TData extends Record<string, unknown> = DataGridRow, TSortField extends keyof TData = keyof TData>({ keyId, columns, rows, variant, tree, subrows, selectedRows, maxHeight, isLoading, isError, isDisabled, isEndReached, onEndReached, onStartReached, isStartReached, onSelectRow, isHideSelectAll, initialVisibleItemIndex, isHideHeaderIfNoData, gridViewMode: gridViewModeProp, mobileDisplayVariant, virtuosoRef, }: UseLogicParams<TData, TSortField>) => {
     containerCssVars: import("react").CSSProperties;
     mobileSkeletonProps: {
         cellsCount: number;
@@ -24,12 +24,17 @@ export declare const useLogic: <TData extends Record<string, unknown> = DataGrid
     hasGroupedColumns: boolean;
     gridViewMode: "standard" | "full";
     gridColumns: string;
+    isStartReached: boolean | undefined;
+    isNotRenderHeader: boolean | undefined;
+    initialTopMostItemIndex: number | undefined;
     virtuosoProps: {
         id: string;
-        ref: import("react").RefObject<VirtuosoHandle | null>;
+        ref: (node: DataGridInfiniteVirtuosoHandle | null) => void;
         endReached: () => void;
         rangeChanged: (range: ListRange) => void;
         totalListHeightChanged: () => void;
+        startReached: () => void;
+        firstItemIndex: number;
     };
     headProps: {
         rowsCount: number;
@@ -50,5 +55,6 @@ export declare const useLogic: <TData extends Record<string, unknown> = DataGrid
     handleSelectRow: (row: TData) => (event: ChangeEvent<HTMLInputElement>) => void;
     mobileDisplayVariant: "list" | "cards";
     isSelfContained: boolean;
+    firstItemIndex: number;
 };
 export {};

package/components/DataGridInfinite/useLogic/useLogic.js

@@ -7,12 +7,45 @@ import { useViewportType } from '../../useViewportType';
 import { prop } from '../../utils/prop';
 import { uniqueBy } from '../../utils/uniqueBy';
 import { dataGridInfiniteClassnames, VIRTUOSO_CONTAINER_ID, VIRTUOSO_LIST_ID, } from '../constants';
-export const useLogic = ({ keyId, columns, rows, variant, tree, subrows, selectedRows = [], maxHeight, isLoading, isDisabled, isEndReached, onEndReached, onSelectRow, isHideSelectAll, isHideHeaderIfNoData = false, gridViewMode: gridViewModeProp = 'standard', mobileDisplayVariant = variant === 'subrows' ? 'cards' : 'list', }) => {
+export const useLogic = ({ keyId, columns, rows, variant, tree, subrows, selectedRows = [], maxHeight, isLoading, isError, isDisabled, isEndReached, onEndReached, onStartReached, isStartReached, onSelectRow, isHideSelectAll, initialVisibleItemIndex, isHideHeaderIfNoData = false, gridViewMode: gridViewModeProp = 'standard', mobileDisplayVariant = variant === 'subrows' ? 'cards' : 'list', virtuosoRef, }) => {
     const virtuoso = useRef(null);
+    const handleVirtuosoRef = useCallback((node) => {
+        virtuoso.current = node;
+        if (virtuosoRef) {
+            virtuosoRef.current = node;
+        }
+    }, [virtuosoRef]);
     const scrollToTopButtonRef = useRef(null);
     const { isMobile } = useViewportType();
     // Реф добавлен для избежания замыкания selectedRows в handleSelectRow (иначе в handleSelectRow приходят некорректные значения selectedRows).
     const selectedRowsRef = useRef(selectedRows);
+    // Рефы для вычисления firstItemIndex
+    // baseIndex - базовый индекс для вычисления firstItemIndex. Делаем очень большим, что бы при подгрузке данных вверх(начало списка) virtuoso ставил им индексы меньше чем этот.
+    const baseIndex = useRef(10000);
+    const initialLength = useRef(rows.length);
+    const firstRowId = useRef(rows[0]?.[keyId]);
+    // Вычисляем firstItemIndex для динамической подгрузки данных вверх. Что бы virtuoso понимал что данные сверху еще есть и не надо скролить до верха списка.
+    const firstItemIndex = useMemo(() => {
+        const currentLength = rows.length;
+        const currentFirstId = rows[0]?.[keyId];
+        if (currentLength !== initialLength.current) {
+            // Если первый элемент изменился и длина увеличилась → подгрузка вверх
+            if (currentFirstId !== firstRowId.current &&
+                currentLength > initialLength.current) {
+                const addedCount = currentLength - initialLength.current;
+                baseIndex.current -= addedCount;
+                firstRowId.current = currentFirstId;
+            }
+            else if (currentLength < initialLength.current) {
+                baseIndex.current = 10000;
+                firstRowId.current = currentFirstId;
+            }
+            // Если длина увеличилась, но первый элемент не изменился → подгрузка вниз
+            // baseIndex не меняем
+            initialLength.current = currentLength;
+        }
+        return baseIndex.current;
+    }, [rows.length]);
     useEffect(() => {
         selectedRowsRef.current = selectedRows;
     }, [selectedRows]);
@@ -43,12 +76,17 @@ export const useLogic = ({ keyId, columns, rows, variant, tree, subrows, selecte
             onEndReached();
         }
     }, [isEndReached, onEndReached]);
+    const handleStartReach = useCallback(() => {
+        if (!isStartReached && onStartReached) {
+            onStartReached();
+        }
+    }, [isStartReached, onStartReached]);
     const uncheckedRowsCount = useMemo(() => {
         return availableRows.filter((row) => !selectedRows.find((selectedRow) => selectedRow[keyId] === row[keyId])).length;
     }, [availableRows, selectedRows, keyId]);
     const handleRangeChanged = useCallback((range) => {
         if (scrollToTopButtonRef.current) {
-            scrollToTopButtonRef.current.classList.toggle(dataGridInfiniteClassnames.visibleScrollToTopButton, range.startIndex > 2);
+            scrollToTopButtonRef.current.classList.toggle(dataGridInfiniteClassnames.visibleScrollToTopButton, range.startIndex > baseIndex.current + 2);
         }
     }, []);
     const handleSelectAllRows = (event) => {
@@ -87,6 +125,11 @@ export const useLogic = ({ keyId, columns, rows, variant, tree, subrows, selecte
         mobileDisplayVariant,
     });
     const containerCssVars = getDataGridCssVars(maxHeight);
+    const foundIndex = rows.findIndex((row) => String(row[keyId]) === String(initialVisibleItemIndex));
+    const initialTopMostItemIndex = foundIndex === -1 ? undefined : foundIndex;
+    const isNotRenderHeader = (!isLoading && !isError && !isStartReached) ||
+        !onStartReached ||
+        isStartReached;
     return {
         containerCssVars,
         mobileSkeletonProps,
@@ -99,12 +142,17 @@ export const useLogic = ({ keyId, columns, rows, variant, tree, subrows, selecte
         hasGroupedColumns,
         gridViewMode,
         gridColumns,
+        isStartReached,
+        isNotRenderHeader,
+        initialTopMostItemIndex,
         virtuosoProps: {
             id: VIRTUOSO_CONTAINER_ID,
-            ref: virtuoso,
+            ref: handleVirtuosoRef,
             endReached: handleEndReach,
             rangeChanged: handleRangeChanged,
             totalListHeightChanged: recalculateVerticalScroll,
+            startReached: handleStartReach,
+            firstItemIndex,
         },
         headProps: {
             rowsCount: availableRows.length,
@@ -125,5 +173,6 @@ export const useLogic = ({ keyId, columns, rows, variant, tree, subrows, selecte
         handleSelectRow,
         mobileDisplayVariant,
         isSelfContained: mobileDisplayVariant === 'cards',
+        firstItemIndex,
     };
 };

package/node/components/DataGridInfinite/DataGridInfinite.js

@@ -45,7 +45,7 @@ const dataGridInfiniteCva = (0, cva_1.cva)(constants_2.dataGridClassnames.root,
 });
 const DataGridInfinite = (props) => {
     const { imagesMap, emptySymbol } = (0, react_1.useContext)(ConfigProvider_1.ConfigContext);
-    const { isNoData, isDataGridDisabled, treeRenderConfig, virtuosoProps, headProps, rowProps, scrollToTopButtonProps, isEndReached, isHideHead, containerCssVars, isMobile, mobileSkeletonProps, hasGroupedColumns, gridViewMode, gridColumns, handleSelectRow, mobileDisplayVariant, isSelfContained, } = (0, useLogic_1.useLogic)(props);
+    const { isNoData, isDataGridDisabled, treeRenderConfig, virtuosoProps, headProps, rowProps, scrollToTopButtonProps, isEndReached, isHideHead, containerCssVars, isMobile, mobileSkeletonProps, hasGroupedColumns, gridViewMode, gridColumns, handleSelectRow, mobileDisplayVariant, isSelfContained, isNotRenderHeader, initialTopMostItemIndex, } = (0, useLogic_1.useLogic)(props);
     const { columns, rows = [], selectedRows = [], sorting, isLoading, isDisabled, keyId, emptyCellValue = emptySymbol, variant = enums_1.Variant.Tree, subrows, className, isError, endOfScrollMsg, errorMsg, noDataPlaceholder, onRowClick, onSort, onRetry, headPreAddon, activeRowId, isTabularNums, renderRow, } = props;
     const { moreButtonColumnPosition = 1, isVisibleCollapseButton = true } = subrows || {};
     const { isInitialExpanded = false, expandedLevel = constants_2.EXPANDED_LEVEL_BY_DEFAULT, initialVisibleChildrenCount = constants_2.INITIAL_OPENED_NESTED_CHILDREN_COUNT_BY_DEFAULT, } = treeRenderConfig || {};
@@ -61,7 +61,9 @@ const DataGridInfinite = (props) => {
                                     errorList: [errorMsg || ''],
                                     imgSrc: imagesMap.defaultErrorImgSrc,
                                     onRetry,
-                                }, children: (0, jsx_runtime_1.jsx)(react_virtuoso_1.Virtuoso, { ...virtuosoProps, style: { height: '100%' }, overscan: constants_3.OVERSCAN_COUNT, data: rows, components: {
+                                }, children: (0, jsx_runtime_1.jsx)(react_virtuoso_1.Virtuoso, { ...virtuosoProps, ...(initialTopMostItemIndex && {
+                                        initialTopMostItemIndex,
+                                    }), style: { height: '100%' }, overscan: constants_3.OVERSCAN_COUNT, data: rows, components: {
                                         // biome-ignore lint/suspicious/noTsIgnore: Требует HTMLDivElement, а для элемента списка используем HTMLUListElement (https://github.com/petyosi/react-virtuoso/issues/864)
                                         // @ts-ignore
                                         List: List_1.List,
@@ -73,6 +75,12 @@ const DataGridInfinite = (props) => {
                                             }
                                             return ((0, jsx_runtime_1.jsxs)(styles_1.FooterRow, { children: [isLoading && (0, jsx_runtime_1.jsx)(Loader_1.Loader, {}), isError && (0, jsx_runtime_1.jsx)(ErrorMessage_1.ErrorMessage, { onRetry: onRetry }), isEndReached && ((0, jsx_runtime_1.jsx)(EndData_1.EndData, { endOfScrollMsg: endOfScrollMsg }))] }));
                                         },
+                                        Header: () => {
+                                            if (isNotRenderHeader) {
+                                                return null;
+                                            }
+                                            return ((0, jsx_runtime_1.jsxs)(styles_1.HeaderRow, { children: [isLoading && (0, jsx_runtime_1.jsx)(Loader_1.Loader, {}), isError && (0, jsx_runtime_1.jsx)(ErrorMessage_1.ErrorMessage, { onRetry: onRetry })] }));
+                                        },
                                     } }) }), (0, jsx_runtime_1.jsx)(styles_1.StyledScrollToTopButton, { ...scrollToTopButtonProps, className: constants_3.dataGridInfiniteClassnames.scrollToTopButton }), isDisabled && (0, jsx_runtime_1.jsx)(styles_1.Backdrop, {})] })] }) }) }));
 };
 exports.DataGridInfinite = DataGridInfinite;

package/node/components/DataGridInfinite/Row/Row.js

@@ -9,6 +9,6 @@ const useLogic_1 = require("./useLogic");
 const INITIAL_LEVEL = 0;
 const Row = ({ children, ...props }) => {
     const { item, memoizedItemProps, onSelectRow, renderRow, flattenColumns, gridColumns, options, keyId, variant, isSelectable, isSelected, nestedChildren, isInitialExpanded, expandedLevel, initialVisibleChildrenCount, moreButtonColumnPosition, isVisibleCollapseButton, emptyCellValue, activeRowId, onRowClick, } = (0, useLogic_1.useLogic)(props);
-    return ((0, jsx_runtime_1.jsx)(RowContext_1.RowContextProvider, { row: item, itemProps: memoizedItemProps, onSelectRow: onSelectRow, isSelectable: isSelectable, isSelected: isSelected, children: renderRow ? ((0, jsx_runtime_1.jsx)(CustomRowWrapper_1.CustomRowWrapper, { index: memoizedItemProps['data-item-index'], renderRow: renderRow, row: item })) : ((0, jsx_runtime_1.jsx)(Row_1.Row, { ...memoizedItemProps, row: item, columns: flattenColumns, gridColumns: gridColumns, options: options, keyId: keyId, variant: variant, isSelectable: isSelectable, isSelected: isSelected, level: INITIAL_LEVEL, nestedChildren: nestedChildren, isInitialExpanded: isInitialExpanded || false, expandedLevel: expandedLevel || 1, initialVisibleChildrenCount: initialVisibleChildrenCount || 2, activeRowId: activeRowId, moreButtonColumnPosition: moreButtonColumnPosition || 1, isVisibleCollapseButton: isVisibleCollapseButton || true, emptyCellValue: emptyCellValue, onRowClick: onRowClick, onSelectRow: onSelectRow })) }));
+    return ((0, jsx_runtime_1.jsx)(RowContext_1.RowContextProvider, { row: item, itemProps: memoizedItemProps, onSelectRow: onSelectRow, isSelectable: isSelectable, isSelected: isSelected, children: renderRow ? ((0, jsx_runtime_1.jsx)(CustomRowWrapper_1.CustomRowWrapper, { index: memoizedItemProps['data-index'], renderRow: renderRow, row: item })) : ((0, jsx_runtime_1.jsx)(Row_1.Row, { ...memoizedItemProps, row: item, columns: flattenColumns, gridColumns: gridColumns, options: options, keyId: keyId, variant: variant, isSelectable: isSelectable, isSelected: isSelected, level: INITIAL_LEVEL, nestedChildren: nestedChildren, isInitialExpanded: isInitialExpanded || false, expandedLevel: expandedLevel || 1, initialVisibleChildrenCount: initialVisibleChildrenCount || 2, activeRowId: activeRowId, moreButtonColumnPosition: moreButtonColumnPosition || 1, isVisibleCollapseButton: isVisibleCollapseButton || true, emptyCellValue: emptyCellValue, onRowClick: onRowClick, onSelectRow: onSelectRow })) }));
 };
 exports.Row = Row;

package/node/components/DataGridInfinite/index.d.ts

@@ -1,2 +1,2 @@
 export { DataGridInfinite } from './DataGridInfinite';
-export type { DataGridInfiniteProps } from './types';
+export type { DataGridInfiniteProps, DataGridInfiniteVirtuosoHandle, DataGridInfiniteVirtuosoRef, } from './types';

package/node/components/DataGridInfinite/public.d.ts

@@ -1,2 +1,2 @@
 export { DataGridInfinite } from './DataGridInfinite';
-export type { DataGridInfiniteProps } from './types';
+export type { DataGridInfiniteProps, DataGridInfiniteVirtuosoHandle, DataGridInfiniteVirtuosoRef, } from './types';

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

@@ -13,6 +13,10 @@ export declare const FooterRow: import("@emotion/styled/dist/declarations/src/ty
     theme?: import("@emotion/react").Theme | undefined;
     as?: import("react").ElementType<any, keyof import("react").JSX.IntrinsicElements> | undefined;
 }, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLElement>, HTMLElement>, {}>;
+export declare const HeaderRow: 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<HTMLElement>, HTMLElement>, {}>;
 export declare const Backdrop: 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/components/DataGridInfinite/styles.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StyledContainer = exports.StyledScrollToTopButton = exports.Backdrop = exports.FooterRow = exports.DisabledDataGridWrapper = exports.DataGridWrapper = void 0;
+exports.StyledContainer = exports.StyledScrollToTopButton = exports.Backdrop = exports.HeaderRow = exports.FooterRow = exports.DisabledDataGridWrapper = exports.DataGridWrapper = void 0;
 const styles_1 = require("../DataGrid/styles");
 const ScrollToTopButton_1 = require("../ScrollToTopButton");
 const styled_1 = require("../styled");
@@ -29,6 +29,14 @@ exports.FooterRow = styled_1.styled.footer `
 
   min-height: 68px;
 `;
+exports.HeaderRow = styled_1.styled.header `
+  display: flex;
+  flex-shrink: 0;
+  align-items: center;
+  justify-content: center;
+
+  min-height: 68px;
+`;
 exports.Backdrop = styled_1.styled.div `
   position: absolute;
   top: 0;

package/node/components/DataGridInfinite/types.d.ts

@@ -1,6 +1,14 @@
+import { type Ref, type RefObject } from 'react';
+import { type VirtuosoHandle } from 'react-virtuoso';
 import type { DataGridProps, DataGridRow } from '../DataGrid';
 import { type CellValue } from '../DataGrid/types';
+export type DataGridInfiniteVirtuosoHandle = VirtuosoHandle;
+export type DataGridInfiniteVirtuosoRef = RefObject<DataGridInfiniteVirtuosoHandle | null>;
 export type DataGridInfiniteProps<TData extends Record<string, CellValue> = DataGridRow, TSortField extends keyof TData = keyof TData> = Omit<DataGridProps<TData, TSortField>, 'footer' | 'minDisplayRows'> & {
+    /**
+     * Ref для доступа к методам Virtuoso
+     */
+    virtuosoRef?: Ref<DataGridInfiniteVirtuosoHandle>;
     /**
      * Флаг достижения конца списка
      */
@@ -17,4 +25,16 @@ export type DataGridInfiniteProps<TData extends Record<string, CellValue> = Data
      * Убирает шапку таблицы, когда нет данных
      */
     isHideHeaderIfNoData?: boolean;
+    /**
+     * Обработчик подгрузки данных при скроле до начала списка
+     */
+    onStartReached?: () => void;
+    /**
+     * Флаг достижения начала списка
+     */
+    isStartReached?: boolean;
+    /**
+     * Индекс первого видимого элемента
+     */
+    initialVisibleItemIndex?: number;
 };

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

@@ -1,10 +1,10 @@
 import { type ChangeEvent } from 'react';
-import type { ListRange, VirtuosoHandle } from 'react-virtuoso';
+import type { ListRange } from 'react-virtuoso';
 import { type DataGridRow } from '../../DataGrid';
 import { type CellValue } from '../../DataGrid/types';
-import { type DataGridInfiniteProps } from '../types';
+import { type DataGridInfiniteProps, type DataGridInfiniteVirtuosoHandle } from '../types';
 type UseLogicParams<TData extends Record<string, CellValue> = DataGridRow, TSortField extends keyof TData = keyof TData> = DataGridInfiniteProps<TData, TSortField>;
-export declare const useLogic: <TData extends Record<string, unknown> = DataGridRow, TSortField extends keyof TData = keyof TData>({ keyId, columns, rows, variant, tree, subrows, selectedRows, maxHeight, isLoading, isDisabled, isEndReached, onEndReached, onSelectRow, isHideSelectAll, isHideHeaderIfNoData, gridViewMode: gridViewModeProp, mobileDisplayVariant, }: UseLogicParams<TData, TSortField>) => {
+export declare const useLogic: <TData extends Record<string, unknown> = DataGridRow, TSortField extends keyof TData = keyof TData>({ keyId, columns, rows, variant, tree, subrows, selectedRows, maxHeight, isLoading, isError, isDisabled, isEndReached, onEndReached, onStartReached, isStartReached, onSelectRow, isHideSelectAll, initialVisibleItemIndex, isHideHeaderIfNoData, gridViewMode: gridViewModeProp, mobileDisplayVariant, virtuosoRef, }: UseLogicParams<TData, TSortField>) => {
     containerCssVars: import("react").CSSProperties;
     mobileSkeletonProps: {
         cellsCount: number;
@@ -24,12 +24,17 @@ export declare const useLogic: <TData extends Record<string, unknown> = DataGrid
     hasGroupedColumns: boolean;
     gridViewMode: "standard" | "full";
     gridColumns: string;
+    isStartReached: boolean | undefined;
+    isNotRenderHeader: boolean | undefined;
+    initialTopMostItemIndex: number | undefined;
     virtuosoProps: {
         id: string;
-        ref: import("react").RefObject<VirtuosoHandle | null>;
+        ref: (node: DataGridInfiniteVirtuosoHandle | null) => void;
         endReached: () => void;
         rangeChanged: (range: ListRange) => void;
         totalListHeightChanged: () => void;
+        startReached: () => void;
+        firstItemIndex: number;
     };
     headProps: {
         rowsCount: number;
@@ -50,5 +55,6 @@ export declare const useLogic: <TData extends Record<string, unknown> = DataGrid
     handleSelectRow: (row: TData) => (event: ChangeEvent<HTMLInputElement>) => void;
     mobileDisplayVariant: "list" | "cards";
     isSelfContained: boolean;
+    firstItemIndex: number;
 };
 export {};

package/node/components/DataGridInfinite/useLogic/useLogic.js

@@ -10,12 +10,45 @@ const useViewportType_1 = require("../../useViewportType");
 const prop_1 = require("../../utils/prop");
 const uniqueBy_1 = require("../../utils/uniqueBy");
 const constants_2 = require("../constants");
-const useLogic = ({ keyId, columns, rows, variant, tree, subrows, selectedRows = [], maxHeight, isLoading, isDisabled, isEndReached, onEndReached, onSelectRow, isHideSelectAll, isHideHeaderIfNoData = false, gridViewMode: gridViewModeProp = 'standard', mobileDisplayVariant = variant === 'subrows' ? 'cards' : 'list', }) => {
+const useLogic = ({ keyId, columns, rows, variant, tree, subrows, selectedRows = [], maxHeight, isLoading, isError, isDisabled, isEndReached, onEndReached, onStartReached, isStartReached, onSelectRow, isHideSelectAll, initialVisibleItemIndex, isHideHeaderIfNoData = false, gridViewMode: gridViewModeProp = 'standard', mobileDisplayVariant = variant === 'subrows' ? 'cards' : 'list', virtuosoRef, }) => {
     const virtuoso = (0, react_1.useRef)(null);
+    const handleVirtuosoRef = (0, react_1.useCallback)((node) => {
+        virtuoso.current = node;
+        if (virtuosoRef) {
+            virtuosoRef.current = node;
+        }
+    }, [virtuosoRef]);
     const scrollToTopButtonRef = (0, react_1.useRef)(null);
     const { isMobile } = (0, useViewportType_1.useViewportType)();
     // Реф добавлен для избежания замыкания selectedRows в handleSelectRow (иначе в handleSelectRow приходят некорректные значения selectedRows).
     const selectedRowsRef = (0, react_1.useRef)(selectedRows);
+    // Рефы для вычисления firstItemIndex
+    // baseIndex - базовый индекс для вычисления firstItemIndex. Делаем очень большим, что бы при подгрузке данных вверх(начало списка) virtuoso ставил им индексы меньше чем этот.
+    const baseIndex = (0, react_1.useRef)(10000);
+    const initialLength = (0, react_1.useRef)(rows.length);
+    const firstRowId = (0, react_1.useRef)(rows[0]?.[keyId]);
+    // Вычисляем firstItemIndex для динамической подгрузки данных вверх. Что бы virtuoso понимал что данные сверху еще есть и не надо скролить до верха списка.
+    const firstItemIndex = (0, react_1.useMemo)(() => {
+        const currentLength = rows.length;
+        const currentFirstId = rows[0]?.[keyId];
+        if (currentLength !== initialLength.current) {
+            // Если первый элемент изменился и длина увеличилась → подгрузка вверх
+            if (currentFirstId !== firstRowId.current &&
+                currentLength > initialLength.current) {
+                const addedCount = currentLength - initialLength.current;
+                baseIndex.current -= addedCount;
+                firstRowId.current = currentFirstId;
+            }
+            else if (currentLength < initialLength.current) {
+                baseIndex.current = 10000;
+                firstRowId.current = currentFirstId;
+            }
+            // Если длина увеличилась, но первый элемент не изменился → подгрузка вниз
+            // baseIndex не меняем
+            initialLength.current = currentLength;
+        }
+        return baseIndex.current;
+    }, [rows.length]);
     (0, react_1.useEffect)(() => {
         selectedRowsRef.current = selectedRows;
     }, [selectedRows]);
@@ -46,12 +79,17 @@ const useLogic = ({ keyId, columns, rows, variant, tree, subrows, selectedRows =
             onEndReached();
         }
     }, [isEndReached, onEndReached]);
+    const handleStartReach = (0, react_1.useCallback)(() => {
+        if (!isStartReached && onStartReached) {
+            onStartReached();
+        }
+    }, [isStartReached, onStartReached]);
     const uncheckedRowsCount = (0, react_1.useMemo)(() => {
         return availableRows.filter((row) => !selectedRows.find((selectedRow) => selectedRow[keyId] === row[keyId])).length;
     }, [availableRows, selectedRows, keyId]);
     const handleRangeChanged = (0, react_1.useCallback)((range) => {
         if (scrollToTopButtonRef.current) {
-            scrollToTopButtonRef.current.classList.toggle(constants_2.dataGridInfiniteClassnames.visibleScrollToTopButton, range.startIndex > 2);
+            scrollToTopButtonRef.current.classList.toggle(constants_2.dataGridInfiniteClassnames.visibleScrollToTopButton, range.startIndex > baseIndex.current + 2);
         }
     }, []);
     const handleSelectAllRows = (event) => {
@@ -90,6 +128,11 @@ const useLogic = ({ keyId, columns, rows, variant, tree, subrows, selectedRows =
         mobileDisplayVariant,
     });
     const containerCssVars = (0, utils_1.getDataGridCssVars)(maxHeight);
+    const foundIndex = rows.findIndex((row) => String(row[keyId]) === String(initialVisibleItemIndex));
+    const initialTopMostItemIndex = foundIndex === -1 ? undefined : foundIndex;
+    const isNotRenderHeader = (!isLoading && !isError && !isStartReached) ||
+        !onStartReached ||
+        isStartReached;
     return {
         containerCssVars,
         mobileSkeletonProps,
@@ -102,12 +145,17 @@ const useLogic = ({ keyId, columns, rows, variant, tree, subrows, selectedRows =
         hasGroupedColumns,
         gridViewMode,
         gridColumns,
+        isStartReached,
+        isNotRenderHeader,
+        initialTopMostItemIndex,
         virtuosoProps: {
             id: constants_2.VIRTUOSO_CONTAINER_ID,
-            ref: virtuoso,
+            ref: handleVirtuosoRef,
             endReached: handleEndReach,
             rangeChanged: handleRangeChanged,
             totalListHeightChanged: recalculateVerticalScroll,
+            startReached: handleStartReach,
+            firstItemIndex,
         },
         headProps: {
             rowsCount: availableRows.length,
@@ -128,6 +176,7 @@ const useLogic = ({ keyId, columns, rows, variant, tree, subrows, selectedRows =
         handleSelectRow,
         mobileDisplayVariant,
         isSelfContained: mobileDisplayVariant === 'cards',
+        firstItemIndex,
     };
 };
 exports.useLogic = useLogic;

package/package.json

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