From 4582a45b931823d9bc6609821b9a9d097dd2f671 Mon Sep 17 00:00:00 2001
From: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
Date: Tue, 1 Apr 2025 13:28:34 -0500
Subject: [PATCH] TableNG: Fix sorting (#103215)

* wip sorted rows

* Move rowIdx calculation to TableNG top level

* Remove old unused props

---------

Co-authored-by: drew08t <drew08@gmail.com>
---
 packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx b/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx
index 70019b5a9f7..7b9bff47547 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx
@@ -741,7 +741,7 @@ export function mapFrameToDataGrid({
             timeRange={timeRange ?? getDefaultTimeRange()}
             height={defaultRowHeight}
             justifyContent={justifyColumnContent}
-            rowIdx={rowIdx}
+            rowIdx={sortedRows[rowIdx].__index}
             shouldTextOverflow={() =>
               shouldTextOverflow(
                 key,