From cc38bc132e0a1fc0dc475e0222afb747752d224d Mon Sep 17 00:00:00 2001 From: Khushboo Vashi Date: Mon, 15 Nov 2021 18:26:16 +0530 Subject: [PATCH] Fixed scroll issue in the browser tree when navigating using the keyboard. --- web/package.json | 2 +- web/pgadmin/static/js/tree/tree.js | 8 ++++---- .../static/js/search_objects_dialog_wrapper.js | 2 +- web/yarn.lock | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/web/package.json b/web/package.json index f6f56cfd8..273b08eea 100644 --- a/web/package.json +++ b/web/package.json @@ -136,7 +136,7 @@ "path-fx": "^2.0.0", "pathfinding": "^0.4.18", "paths-js": "^0.4.9", - "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#cfb580e396714dbdd941c64e0f90598ee478ea21", + "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#90e62d4371d3d25a957b3ffc7c6cb81a928da06f", "postcss": "^8.2.15", "raf": "^3.4.1", "react": "^17.0.1", diff --git a/web/pgadmin/static/js/tree/tree.js b/web/pgadmin/static/js/tree/tree.js index 5f0700275..42c8b1298 100644 --- a/web/pgadmin/static/js/tree/tree.js +++ b/web/pgadmin/static/js/tree/tree.js @@ -140,12 +140,12 @@ export class Tree { await this.tree.toggleDirectory(item); } - async select(item, ensureVisible=false) { - await this.tree.setActiveFile(item, ensureVisible); + async select(item, ensureVisible=false, align='auto') { + await this.tree.setActiveFile(item, ensureVisible, align); } - async selectNode(item, ensureVisible=false) { - this.tree.setActiveFile(item, ensureVisible); + async selectNode(item, ensureVisible=false, align='auto') { + this.tree.setActiveFile(item, ensureVisible, align); } async unload(item) { diff --git a/web/pgadmin/tools/search_objects/static/js/search_objects_dialog_wrapper.js b/web/pgadmin/tools/search_objects/static/js/search_objects_dialog_wrapper.js index f8249a892..0b4380a8b 100644 --- a/web/pgadmin/tools/search_objects/static/js/search_objects_dialog_wrapper.js +++ b/web/pgadmin/tools/search_objects/static/js/search_objects_dialog_wrapper.js @@ -289,7 +289,7 @@ export default class SearchObjectsDialogWrapper extends DialogWrapper { tree.findNodeWithToggle(rowData.id_path) .then((treeItem)=>{ setTimeout(() => { - tree.select(treeItem, true); + tree.select(treeItem, true, 'center'); }, 100); this.showMessage(null); }) diff --git a/web/yarn.lock b/web/yarn.lock index 758b6d8b1..bc0ddbc0c 100644 --- a/web/yarn.lock +++ b/web/yarn.lock @@ -7189,9 +7189,9 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#cfb580e396714dbdd941c64e0f90598ee478ea21": +"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#90e62d4371d3d25a957b3ffc7c6cb81a928da06f": version "1.0.0" - resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#cfb580e396714dbdd941c64e0f90598ee478ea21" + resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#90e62d4371d3d25a957b3ffc7c6cb81a928da06f" dependencies: "@types/classnames" "^2.2.6" "@types/react" "^16.7.18"