From 5bab32ed77caaa3fd96edfc0a1f168532395fbcc Mon Sep 17 00:00:00 2001
From: Dani Cairns <dcairns@specterops.io>
Date: Fri, 24 Jul 2026 17:34:11 -0700
Subject: [PATCH 1/5]  restore table height virtualization classname

---
 .../bh-shared-ui/src/components/ExploreTable/ExploreTable.tsx    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/javascript/bh-shared-ui/src/components/ExploreTable/ExploreTable.tsx b/packages/javascript/bh-shared-ui/src/components/ExploreTable/ExploreTable.tsx
index 8ee41c957721..c999dbcb2ea1 100644
--- a/packages/javascript/bh-shared-ui/src/components/ExploreTable/ExploreTable.tsx
+++ b/packages/javascript/bh-shared-ui/src/components/ExploreTable/ExploreTable.tsx
@@ -223,6 +223,7 @@ const ExploreTable = ({
                         onColumnOrderChange={(newOrder) => {
                             setColumnOrder(newOrder);
                         }}
+                        className='overflow-auto h-[calc(50vh-72px)]'
                         growLastColumn
                         enableResizing
                         enableDragAndDrop

From 2bca121a3f0afbff30f24d4a7cb15217947e5425 Mon Sep 17 00:00:00 2001
From: Dani Cairns <dcairns@specterops.io>
Date: Fri, 24 Jul 2026 17:59:48 -0700
Subject: [PATCH 2/5]  remove scroll area

---
 .../components/ExploreTable/ExploreTable.tsx  | 55 ++++++++++---------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/packages/javascript/bh-shared-ui/src/components/ExploreTable/ExploreTable.tsx b/packages/javascript/bh-shared-ui/src/components/ExploreTable/ExploreTable.tsx
index c999dbcb2ea1..445643efb65a 100644
--- a/packages/javascript/bh-shared-ui/src/components/ExploreTable/ExploreTable.tsx
+++ b/packages/javascript/bh-shared-ui/src/components/ExploreTable/ExploreTable.tsx
@@ -14,7 +14,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-import { DataTable, ScrollArea } from 'doodle-ui';
+import { DataTable } from 'doodle-ui';
 import fileDownload from 'js-file-download';
 import { json2csv } from 'json-2-csv';
 import { ChangeEvent, memo, useCallback, useMemo, useState } from 'react';
@@ -203,32 +203,33 @@ const ExploreTable = ({
                     resultsCount={resultsCount}
                     SearchInputProps={searchInputProps}
                 />
-                <ScrollArea>
-                    <MemoDataTable
-                        TableHeaderProps={tableHeaderProps}
-                        TableHeadProps={tableHeadProps}
-                        TableProps={tableProps}
-                        TableCellProps={tableCellProps}
-                        columnPinning={columnPinning}
-                        setColumnPinning={handleSetColumnPinning}
-                        onRowClick={handleRowClick}
-                        selectedRow={selectedItem || undefined}
-                        data={sortedFilteredRows}
-                        columns={tableColumns as DataTableProps['columns']}
-                        tableOptions={tableOptions}
-                        virtualizationOptions={virtualizationOptions}
-                        columnSizing={columnSizing}
-                        onColumnSizingChange={setColumnSizing}
-                        columnOrder={columnOrder}
-                        onColumnOrderChange={(newOrder) => {
-                            setColumnOrder(newOrder);
-                        }}
-                        className='overflow-auto h-[calc(50vh-72px)]'
-                        growLastColumn
-                        enableResizing
-                        enableDragAndDrop
-                    />
-                </ScrollArea>
+                <MemoDataTable
+                    TableHeaderProps={tableHeaderProps}
+                    TableHeadProps={tableHeadProps}
+                    TableProps={tableProps}
+                    TableCellProps={tableCellProps}
+                    columnPinning={columnPinning}
+                    setColumnPinning={handleSetColumnPinning}
+                    onRowClick={handleRowClick}
+                    selectedRow={selectedItem || undefined}
+                    data={sortedFilteredRows}
+                    columns={tableColumns as DataTableProps['columns']}
+                    tableOptions={tableOptions}
+                    virtualizationOptions={virtualizationOptions}
+                    columnSizing={columnSizing}
+                    onColumnSizingChange={setColumnSizing}
+                    columnOrder={columnOrder}
+                    onColumnOrderChange={(newOrder) => {
+                        setColumnOrder(newOrder);
+                    }}
+                    className={cn('overflow-auto', {
+                        // TODO: why is header disappearing on bottom scroll? One extra overflow element somewhere
+                        'h-[calc(50vh-72px)]': !isExpanded,
+                        'h-[calc(100vh-72px)]': !isExpanded,
+                    })}
+                    growLastColumn
+                    enableResizing
+                />
             </div>
         </div>
     );

From 5473bd795f57484a43a47e52c4cd5abdda6aa149 Mon Sep 17 00:00:00 2001
From: Dani Cairns <dcairns@specterops.io>
Date: Fri, 24 Jul 2026 18:01:49 -0700
Subject: [PATCH 3/5]  memoize classname

---
 .../src/components/ExploreTable/ExploreTable.tsx  | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/javascript/bh-shared-ui/src/components/ExploreTable/ExploreTable.tsx b/packages/javascript/bh-shared-ui/src/components/ExploreTable/ExploreTable.tsx
index 445643efb65a..b36bbd9442af 100644
--- a/packages/javascript/bh-shared-ui/src/components/ExploreTable/ExploreTable.tsx
+++ b/packages/javascript/bh-shared-ui/src/components/ExploreTable/ExploreTable.tsx
@@ -177,6 +177,15 @@ const ExploreTable = ({
         [onChangePinnedColumns]
     );
 
+    const className = useMemo(
+        () =>
+            cn('overflow-auto', {
+                'h-[calc(50vh-72px)]': !isExpanded,
+                'h-[calc(100vh-72px)]': !isExpanded,
+            }),
+        [isExpanded]
+    );
+
     return (
         <div
             data-testid='explore-table-container-wrapper'
@@ -222,11 +231,7 @@ const ExploreTable = ({
                     onColumnOrderChange={(newOrder) => {
                         setColumnOrder(newOrder);
                     }}
-                    className={cn('overflow-auto', {
-                        // TODO: why is header disappearing on bottom scroll? One extra overflow element somewhere
-                        'h-[calc(50vh-72px)]': !isExpanded,
-                        'h-[calc(100vh-72px)]': !isExpanded,
-                    })}
+                    className={className}
                     growLastColumn
                     enableResizing
                 />

From 3266a59bd860457610be233f65e4057a480ca319 Mon Sep 17 00:00:00 2001
From: Dani Cairns <dcairns@specterops.io>
Date: Mon, 27 Jul 2026 14:28:39 -0700
Subject: [PATCH 4/5]  restore drag and drop prop

---
 .../bh-shared-ui/src/components/ExploreTable/ExploreTable.tsx    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/javascript/bh-shared-ui/src/components/ExploreTable/ExploreTable.tsx b/packages/javascript/bh-shared-ui/src/components/ExploreTable/ExploreTable.tsx
index b36bbd9442af..2df702c1fb12 100644
--- a/packages/javascript/bh-shared-ui/src/components/ExploreTable/ExploreTable.tsx
+++ b/packages/javascript/bh-shared-ui/src/components/ExploreTable/ExploreTable.tsx
@@ -234,6 +234,7 @@ const ExploreTable = ({
                     className={className}
                     growLastColumn
                     enableResizing
+                    enableDragAndDrop
                 />
             </div>
         </div>

From 01d1686db66d9fc6b450e3d234e3789c13209fa3 Mon Sep 17 00:00:00 2001
From: Dani Cairns <dcairns@specterops.io>
Date: Mon, 27 Jul 2026 16:32:53 -0700
Subject: [PATCH 5/5]  remove height for virtualization

---
 .../src/components/ExploreTable/ExploreTable.tsx      | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/packages/javascript/bh-shared-ui/src/components/ExploreTable/ExploreTable.tsx b/packages/javascript/bh-shared-ui/src/components/ExploreTable/ExploreTable.tsx
index 2df702c1fb12..a4c17ac50496 100644
--- a/packages/javascript/bh-shared-ui/src/components/ExploreTable/ExploreTable.tsx
+++ b/packages/javascript/bh-shared-ui/src/components/ExploreTable/ExploreTable.tsx
@@ -177,15 +177,6 @@ const ExploreTable = ({
         [onChangePinnedColumns]
     );
 
-    const className = useMemo(
-        () =>
-            cn('overflow-auto', {
-                'h-[calc(50vh-72px)]': !isExpanded,
-                'h-[calc(100vh-72px)]': !isExpanded,
-            }),
-        [isExpanded]
-    );
-
     return (
         <div
             data-testid='explore-table-container-wrapper'
@@ -231,7 +222,7 @@ const ExploreTable = ({
                     onColumnOrderChange={(newOrder) => {
                         setColumnOrder(newOrder);
                     }}
-                    className={className}
+                    className='overflow-auto h-full'
                     growLastColumn
                     enableResizing
                     enableDragAndDrop