Merge pull request '[AURORA-1147] - фикс расстояния между строчками при изменении масштаба' (#5) from AURORA-1147 into test

Reviewed-on: #5
Reviewed-by: PotapovaA <potapovaanna113@mail.ru>
This commit is contained in:
Veronika 2026-06-26 11:22:22 +03:00
commit b3b5574d86
2 changed files with 11 additions and 0 deletions

View File

@ -19,6 +19,7 @@ import {
BASE_TABLE_CONFIG, BASE_TABLE_CONFIG,
getTableHeadCellStyles, getTableHeadCellStyles,
getTablePaperStyles, getTablePaperStyles,
TABLE_ROW_HEIGHT,
} from './constants/tableConfig'; } from './constants/tableConfig';
import { useRealtime } from './contexts/RealtimeContext'; import { useRealtime } from './contexts/RealtimeContext';
import { toast } from 'react-toastify'; import { toast } from 'react-toastify';
@ -66,10 +67,15 @@ const RealtimeTable = ({ formType, formId, sheetName, direction }) => {
} = useColumnSettings(`${formId}_${formType}_${sheetName}_${direction}`); } = useColumnSettings(`${formId}_${formType}_${sheetName}_${direction}`);
const { headerPortalRef, containerRef } = useHeaderPortal(); const { headerPortalRef, containerRef } = useHeaderPortal();
const rowVirtualizerRef = useRef(null);
const { sizeMult, setSizeMult, tableScaleStyle, tableWrapperStyle } = const { sizeMult, setSizeMult, tableScaleStyle, tableWrapperStyle } =
useTableScale(); useTableScale();
useEffect(() => {
rowVirtualizerRef.current?.measure?.();
}, [sizeMult]);
const [columnsConfig, setColumnsConfig] = useState(null); const [columnsConfig, setColumnsConfig] = useState(null);
useEffect(() => { useEffect(() => {
@ -129,10 +135,13 @@ const RealtimeTable = ({ formType, formId, sheetName, direction }) => {
data: data, data: data,
enableRowVirtualization: true, enableRowVirtualization: true,
enableColumnVirtualization: true, enableColumnVirtualization: true,
rowVirtualizerInstanceRef: rowVirtualizerRef,
rowVirtualizerOptions: { rowVirtualizerOptions: {
overscan: 30, overscan: 30,
scrollPaddingStart: 0, scrollPaddingStart: 0,
scrollPaddingEnd: 0, scrollPaddingEnd: 0,
estimateSize: () => TABLE_ROW_HEIGHT,
measureElement: (el) => el?.offsetHeight || TABLE_ROW_HEIGHT,
}, },
onEditingCellChange: (cell) => { onEditingCellChange: (cell) => {
if (cell) { if (cell) {

View File

@ -1,3 +1,5 @@
export const TABLE_ROW_HEIGHT = 80;
export const BASE_TABLE_CONFIG = { export const BASE_TABLE_CONFIG = {
muiTableRowProps: { muiTableRowProps: {
sx: { height: "5rem" }, sx: { height: "5rem" },