From dfdc748ef386dee205a23ef401004475be78e1ff Mon Sep 17 00:00:00 2001
From: Alex Spencer <52186778+alexjonspencer1@users.noreply.github.com>
Date: Tue, 20 May 2025 07:06:53 -0700
Subject: [PATCH] [release-11.6.2] Table: Fix nested table bug (#105490)

Table: Fix nested table bug (#105133)

chore: remove expandedKey index for key rerendering
(cherry picked from commit 0041c7e9b7b7c07829831ab1e38309150af3f37e)
---
 packages/grafana-ui/src/components/Table/RowsList.tsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/grafana-ui/src/components/Table/RowsList.tsx b/packages/grafana-ui/src/components/Table/RowsList.tsx
index b15745d3b82..7c7ec32e154 100644
--- a/packages/grafana-ui/src/components/Table/RowsList.tsx
+++ b/packages/grafana-ui/src/components/Table/RowsList.tsx
@@ -420,9 +420,6 @@ export const RowsList = (props: RowsListProps) => {
     }
   };
 
-  // Key the virtualizer for expanded rows
-  const expandedKey = Object.keys(tableState.expanded).join('|');
-
   // It's a hack for text wrapping.
   // VariableSizeList component didn't know that we manually set row height.
   // So we need to reset the list when the rows high changes.
@@ -435,8 +432,7 @@ export const RowsList = (props: RowsListProps) => {
   return (
     <CustomScrollbar onScroll={handleScroll} hideHorizontalTrack={true} scrollTop={scrollTop}>
       <VariableSizeList
-        // This component needs an unmount/remount when row height, page changes, or expanded rows change
-        key={`${rowHeight}${pageIndex}${expandedKey}`}
+        key={`${rowHeight}${pageIndex}`}
         height={listHeight}
         itemCount={itemCount}
         itemSize={getItemSize}