From c8666f002969e1b98465094dd1b33a77bd6c4fe5 Mon Sep 17 00:00:00 2001
From: Pravesh Sharma <pravesh.sharma@enterprisedb.com>
Date: Thu, 10 Nov 2022 16:49:41 +0530
Subject: [PATCH] Fixed an issue where the result grid was not working properly
 while trying to edit data by hitting Enter key. #5463

---
 .../static/js/components/QueryToolDataGrid/index.jsx          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx b/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx
index 0b868d28e..2b2f24486 100644
--- a/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx
+++ b/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx
@@ -79,13 +79,13 @@ function CustomRow(props) {
     }
   };
   if(!props.isRowSelected && props.selectedCellIdx > 0) {
-    dataGridExtras.onSelectedCellChange?.([props.row, props.viewportColumns?.[props.selectedCellIdx]]);
+    dataGridExtras.onSelectedCellChange?.([props.row, props.viewportColumns?.find(columns => columns.idx === props.selectedCellIdx)]);
   } else if(props.selectedCellIdx == 0) {
     dataGridExtras.onSelectedCellChange?.(null);
   }
   const openEditorOnEnter = (e)=>{
     if(e.code === 'Enter' && !props.isRowSelected && props.selectedCellIdx > 0) {
-      props.selectCell(props.row, props.viewportColumns?.[props.selectedCellIdx], true);
+      props.selectCell(props.row, props.viewportColumns?.find(columns => columns.idx === props.selectedCellIdx), true);
     }
   };
   return (