From 43703866aa623fbb6f42653ca801f0440721d014 Mon Sep 17 00:00:00 2001
From: Veronika Tsygankova <veronika.amilonn@gmail.com>
Date: Wed, 3 Jun 2026 11:49:06 +0300
Subject: [PATCH 1/3] =?UTF-8?q?[AURORA-1060]=20-=20=D0=92=D0=B8=D1=80?=
 =?UTF-8?q?=D1=83=D1=82=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B4=D0=B5=D1=80=D0=B8=D0=BD=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RealtimeTable/RealtimeTable.jsx           | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/web/src/components/RealtimeTable/RealtimeTable.jsx b/web/src/components/RealtimeTable/RealtimeTable.jsx
index 39e6f0b..b67bcc2 100644
--- a/web/src/components/RealtimeTable/RealtimeTable.jsx
+++ b/web/src/components/RealtimeTable/RealtimeTable.jsx
@@ -65,7 +65,7 @@ const RealtimeTable = ({ formType, formId, sheetName, direction }) => {
   const { headerPortalRef, containerRef } = useHeaderPortal();
 
   const { sizeMult, setSizeMult, tableScaleStyle, tableWrapperStyle } =
-    useTableScale(containerRef);
+    useTableScale();
 
   const [columnsConfig, setColumnsConfig] = useState(null);
 
@@ -125,11 +125,19 @@ const RealtimeTable = ({ formType, formId, sheetName, direction }) => {
       columns,
       data: data,
       enableRowVirtualization: true,
+      enableColumnVirtualization: true,
       rowVirtualizerOptions: {
-        overscan: 50,  
+        overscan: 30,
         scrollPaddingStart: 0,
         scrollPaddingEnd: 0,
       },
+      columnVirtualizerOptions: ({ table }) => ({
+        overscan: 5,
+        measureElement: (el) => {
+          const index = Number(el?.getAttribute?.('data-index'));
+          return table.getVisibleLeafColumns()[index]?.getSize() ?? 0;
+        },
+      }),
       enableRowSelection: true,
       onRowSelectionChange: setRowSelection,
       onColumnSizingChange: setColumnSizing,
@@ -147,14 +155,9 @@ const RealtimeTable = ({ formType, formId, sheetName, direction }) => {
         expanded: true
       },
       meta: tableMeta,
-      muiTableHeadCellProps: ({ column }) => ({
-        sx: {
-          width: column.getSize(),
-          minWidth: column.getSize(),
-          maxWidth: column.getSize(),
-          boxSizing: 'border-box',
-        },
-      }),
+      muiTableHeadCellProps: {
+        sx: { boxSizing: 'border-box' },
+      },
       muiTableBodyCellProps: getTableHeadCellStyles,
       muiTableHeadProps: {
         sx: {

From a47d2e58d0123030fe79b2a6e41785107dfc5cd0 Mon Sep 17 00:00:00 2001
From: Veronika Tsygankova <veronika.amilonn@gmail.com>
Date: Fri, 5 Jun 2026 10:34:34 +0300
Subject: [PATCH 2/3] =?UTF-8?q?[AURORA-1060]=20-=20=D0=B4=D0=BE=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=BB=D0=BE=D0=B0=D0=B4=D0=B5?=
 =?UTF-8?q?=D1=80=20=D0=B4=D0=BB=D1=8F=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8?=
 =?UTF-8?q?=D1=86=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RealtimeTable/RealtimeTable.jsx           | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/web/src/components/RealtimeTable/RealtimeTable.jsx b/web/src/components/RealtimeTable/RealtimeTable.jsx
index b67bcc2..884aa77 100644
--- a/web/src/components/RealtimeTable/RealtimeTable.jsx
+++ b/web/src/components/RealtimeTable/RealtimeTable.jsx
@@ -22,9 +22,10 @@ import {
 } from './constants/tableConfig';
 import { useRealtime } from './contexts/RealtimeContext';
 import { toast } from 'react-toastify';
+import { CircularProgress } from '@mui/material';
 
 const RealtimeTable = ({ formType, formId, sheetName, direction }) => {
-  const { data, setData } = useRealtimeData(formId, sheetName, direction);
+  const { data, setData, isLoading: isTableLoading } = useRealtimeData(formId, sheetName, direction);
   const [globalFilter, setGlobalFilter] = useState('');
   const [showColumnFilters, setShowColumnFilters] = useState(false);
   const [selectedColumn, setSelectedColumn] = useState();
@@ -149,7 +150,8 @@ const RealtimeTable = ({ formType, formId, sheetName, direction }) => {
         columnVisibility,
         globalFilter,
         showColumnFilters,
-        rowSelection
+        rowSelection,
+        isLoading: isTableLoading,
       },
       initialState: {
         expanded: true
@@ -196,6 +198,7 @@ const RealtimeTable = ({ formType, formId, sheetName, direction }) => {
       containerRef,
       tableMeta,
       rowSelection,
+      isTableLoading,
     ],
   );
 
@@ -234,10 +237,6 @@ const RealtimeTable = ({ formType, formId, sheetName, direction }) => {
     setRowSelection({});
   }, [rowSelection, table])
 
-  if (!data) {
-    return <div>Загрузка...</div>;
-  }
-
   return (
     <>
       <SettingsPanel
@@ -269,6 +268,22 @@ const RealtimeTable = ({ formType, formId, sheetName, direction }) => {
           >
             <MaterialReactTable table={table} />
 
+            {isTableLoading && (
+              <div
+                style={{
+                  position: 'absolute',
+                  inset: 0,
+                  display: 'flex',
+                  alignItems: 'center',
+                  justifyContent: 'center',
+                  background: 'rgba(255, 255, 255, 0.6)',
+                  zIndex: 2,
+                }}
+              >
+                <CircularProgress />
+              </div>
+            )}
+
             {headerPortalRef.current &&
               createPortal(
                 <TableHead

From e20461a0ff872235102d73a5366239d0fff09227 Mon Sep 17 00:00:00 2001
From: Veronika Tsygankova <veronika.amilonn@gmail.com>
Date: Fri, 5 Jun 2026 11:17:10 +0300
Subject: [PATCH 3/3] =?UTF-8?q?[AURORA-1060]=20-=20=D0=BF=D0=BE=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B8=D0=B2=D0=BB=D0=B0=20=D0=BE=D1=82=D0=BE=D0=B1?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BB=D0=BE=D0=B0?=
 =?UTF-8?q?=D0=B4=D0=B5=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/components/RealtimeTable/RealtimeTable.jsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web/src/components/RealtimeTable/RealtimeTable.jsx b/web/src/components/RealtimeTable/RealtimeTable.jsx
index 884aa77..654b88a 100644
--- a/web/src/components/RealtimeTable/RealtimeTable.jsx
+++ b/web/src/components/RealtimeTable/RealtimeTable.jsx
@@ -151,7 +151,6 @@ const RealtimeTable = ({ formType, formId, sheetName, direction }) => {
         globalFilter,
         showColumnFilters,
         rowSelection,
-        isLoading: isTableLoading,
       },
       initialState: {
         expanded: true
@@ -198,7 +197,6 @@ const RealtimeTable = ({ formType, formId, sheetName, direction }) => {
       containerRef,
       tableMeta,
       rowSelection,
-      isTableLoading,
     ],
   );