From 4a85d8df16791d468b1fb265b791b120bfe627a9 Mon Sep 17 00:00:00 2001
From: "ilia.brauer" <ilia.brauer@semrush.com>
Date: Wed, 19 Aug 2026 11:15:44 +0200
Subject: [PATCH 1/2] [scroll-area] added early exit from
 calculateSizeContainer for components without wMax and hMax

---
 .../base-components/src/components/scroll-area/ScrollArea.tsx    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/semcore/base-components/src/components/scroll-area/ScrollArea.tsx b/semcore/base-components/src/components/scroll-area/ScrollArea.tsx
index 1c474b588d..918c61be08 100644
--- a/semcore/base-components/src/components/scroll-area/ScrollArea.tsx
+++ b/semcore/base-components/src/components/scroll-area/ScrollArea.tsx
@@ -100,6 +100,7 @@ class ScrollAreaRoot extends Component<
     const { wMax, hMax, observeParentSize } = this.asProps;
     const size = { width: '', height: '' };
     if (!this.$container || !this.$wrapper) return size;
+    if (!wMax && !hMax) return size;
     const { scrollWidth, scrollHeight } = this.$container;
     const style = window.getComputedStyle(this.$wrapper);
     const parent = this.$wrapper.parentElement;

From 057467a560f6041b8865bed35da58f46a01aca60 Mon Sep 17 00:00:00 2001
From: "ilia.brauer" <ilia.brauer@semrush.com>
Date: Wed, 19 Aug 2026 12:03:05 +0200
Subject: [PATCH 2/2] [data-table] fixed loading spinner for grouped headers
 and scroll inside table

---
 semcore/data-table/src/components/Body/Body.tsx         | 2 ++
 semcore/data-table/src/components/Body/style.shadow.css | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/semcore/data-table/src/components/Body/Body.tsx b/semcore/data-table/src/components/Body/Body.tsx
index 89c8f92c43..a187fe0aad 100644
--- a/semcore/data-table/src/components/Body/Body.tsx
+++ b/semcore/data-table/src/components/Body/Body.tsx
@@ -237,6 +237,7 @@ class BodyRoot<Data extends DataTableData, UniqKeyType> extends Component<DataTa
       rows,
       renderCellOverlay,
       selectedRows,
+      hasGroups,
     } = this.asProps;
 
     let rowsToRender = rows;
@@ -394,6 +395,7 @@ class BodyRoot<Data extends DataTableData, UniqKeyType> extends Component<DataTa
           <SSpinContainer
             innerOutline
             // @ts-ignore
+            hasGroups={hasGroups}
             headerHeight={`${this.getSpinnerTopOffset()}px`}
             tabIndex={-1}
             ref={spinnerRef}
diff --git a/semcore/data-table/src/components/Body/style.shadow.css b/semcore/data-table/src/components/Body/style.shadow.css
index 7479011265..96fc262aa0 100644
--- a/semcore/data-table/src/components/Body/style.shadow.css
+++ b/semcore/data-table/src/components/Body/style.shadow.css
@@ -284,10 +284,14 @@ SSpinContainer {
 
   &[headerHeight] {
     position: sticky;
-    top: 0;
+    top: var(--headerHeight);
     height: min(100vh, calc(var(--global-table-height) - var(--headerHeight)));
     min-height: min(100vh, calc(var(--global-table-height) - var(--headerHeight)));
   }
+
+  &[hasGroups] {
+    grid-area: 3 / 1 / 20 / 5;
+  }
 }
 
 SEmptyData {