From 9853d8bfd6ea824055059148354ecf9e8c56b302 Mon Sep 17 00:00:00 2001
From: Yogesh Mahajan <yogesh.mahajan@enterprisedb.com>
Date: Mon, 12 Apr 2021 11:45:04 +0530
Subject: [PATCH] Fixed an issue while selecting the row which was deleted just
 before the selection operation. Fixes #6306

---
 docs/en_US/release_notes_5_2.rst                       | 1 +
 web/pgadmin/static/js/selection/active_cell_capture.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/en_US/release_notes_5_2.rst b/docs/en_US/release_notes_5_2.rst
index 9e6ba4fbd..bfc7198e5 100644
--- a/docs/en_US/release_notes_5_2.rst
+++ b/docs/en_US/release_notes_5_2.rst
@@ -27,6 +27,7 @@ Bug fixes
 | `Issue #6220 <https://redmine.postgresql.org/issues/6220>`_ -  Corrected the syntax for 'CREATE TRIGGER', use 'EXECUTE FUNCTION' instead of 'EXECUTE PROCEDURE' from v11 onwards.
 | `Issue #6274 <https://redmine.postgresql.org/issues/6274>`_ -  Ensure that the strings in the LDAP auth module are translatable.
 | `Issue #6293 <https://redmine.postgresql.org/issues/6293>`_ -  Fixed an issue where the procedure creation is failed when providing the Volatility option.
+| `Issue #6306 <https://redmine.postgresql.org/issues/6306>`_ -  Fixed an issue while selecting the row which was deleted just before the selection operation.
 | `Issue #6325 <https://redmine.postgresql.org/issues/6325>`_ -  Ensure that the file format for the storage manager should be 'All files' and for other dialogs, it should remember the last selected format.
 | `Issue #6327 <https://redmine.postgresql.org/issues/6327>`_ -  Ensure that while comparing domains check function dependencies should be considered in schema diff.
 | `Issue #6333 <https://redmine.postgresql.org/issues/6333>`_ -  Fixed sizing issue of help dialog for Query Tool and ERD Tool when open in the new browser tab.
diff --git a/web/pgadmin/static/js/selection/active_cell_capture.js b/web/pgadmin/static/js/selection/active_cell_capture.js
index 442766ce0..c183cf1ef 100644
--- a/web/pgadmin/static/js/selection/active_cell_capture.js
+++ b/web/pgadmin/static/js/selection/active_cell_capture.js
@@ -108,7 +108,7 @@ define([
         }
 
         if (isClickingLastClickedHeader(rowClicked, 1)) {
-          if (isSingleRangeSelected()) {
+          if (isSingleRangeSelected() || grid.getSelectionModel().getSelectedRanges().length === 0) {
             grid.resetActiveCell();
           } else {
             grid.setActiveCell(retrievePreviousSelectedRange().fromRow, 1);