From c154d07d1617cf669d2ca06e82194f7e19cbaca3 Mon Sep 17 00:00:00 2001
From: "ilia.brauer" <ilia.brauer@semrush.com>
Date: Thu, 16 Oct 2025 09:54:25 +0200
Subject: [PATCH 1/2] [data-table] fixed spinner height, depending on scrolling

---
 .../data-table/src/components/Body/Body.tsx   | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/semcore/data-table/src/components/Body/Body.tsx b/semcore/data-table/src/components/Body/Body.tsx
index 5b6059f851..b16478939b 100644
--- a/semcore/data-table/src/components/Body/Body.tsx
+++ b/semcore/data-table/src/components/Body/Body.tsx
@@ -148,6 +148,22 @@ class BodyRoot<Data extends DataTableData, UniqKeyType> extends Component<DataTa
     };
   }
 
+  getSpinnerTopOffset = () => {
+    const { headerHeight: propsHeaderHeight, tableContainerRef } = this.asProps;
+
+    let headerHeight = propsHeaderHeight;
+
+    if (tableContainerRef.current) {
+      if (tableContainerRef.current.scrollTop > headerHeight) {
+        headerHeight = 0;
+      } else {
+        headerHeight = headerHeight - tableContainerRef.current.scrollTop;
+      }
+    }
+
+    return headerHeight;
+  };
+
   render() {
     const SBody = Root;
     const SRowGroup = Box;
@@ -155,7 +171,6 @@ class BodyRoot<Data extends DataTableData, UniqKeyType> extends Component<DataTa
     const {
       styles,
       loading,
-      headerHeight,
       spinnerRef,
       virtualScroll,
       scrollDirection,
@@ -169,8 +184,6 @@ class BodyRoot<Data extends DataTableData, UniqKeyType> extends Component<DataTa
     } = this.asProps;
 
     let rowsToRender = rows;
-    // let startIndex = -1;
-    // let lastIndex = -1;
 
     if (virtualScroll) {
       const rowsBuffer =
@@ -335,7 +348,7 @@ class BodyRoot<Data extends DataTableData, UniqKeyType> extends Component<DataTa
           <SSpinContainer
             innerOutline
             // @ts-ignore
-            headerHeight={`${headerHeight}px`}
+            headerHeight={`${this.getSpinnerTopOffset()}px`}
             tabIndex={-1}
             ref={spinnerRef}
             role='row'

From 7ec41ccbe9b82de7f2bdcb46ae74d01610c3daeb Mon Sep 17 00:00:00 2001
From: "ilia.brauer" <ilia.brauer@semrush.com>
Date: Wed, 22 Oct 2025 16:18:26 +0200
Subject: [PATCH 2/2] [data-table] fixed spinner offset for table with sticky
 header

---
 semcore/data-table/src/components/Body/Body.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/semcore/data-table/src/components/Body/Body.tsx b/semcore/data-table/src/components/Body/Body.tsx
index b16478939b..ec97cb8dd3 100644
--- a/semcore/data-table/src/components/Body/Body.tsx
+++ b/semcore/data-table/src/components/Body/Body.tsx
@@ -149,10 +149,14 @@ class BodyRoot<Data extends DataTableData, UniqKeyType> extends Component<DataTa
   }
 
   getSpinnerTopOffset = () => {
-    const { headerHeight: propsHeaderHeight, tableContainerRef } = this.asProps;
+    const { headerHeight: propsHeaderHeight, tableContainerRef, stickyHeader } = this.asProps;
 
     let headerHeight = propsHeaderHeight;
 
+    if (stickyHeader) {
+      return headerHeight;
+    }
+
     if (tableContainerRef.current) {
       if (tableContainerRef.current.scrollTop > headerHeight) {
         headerHeight = 0;