IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that the browser tree should auto scroll to the selected node when expanding the server node. #2174

Browse Source
This commit is contained in:
Nikhil Mohite 2022-11-07 10:54:58 +05:30 committed by GitHub
parent 5219c25189
commit c38face9fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/pgadmin/static/js/tree/pgadmin_tree_save_state.js
View File

@ -49,6 +49,8 @@ _.extend(pgBrowser.browserTreeState, {
// Previous tree state // Previous tree state
last_state: {}, last_state: {},
is_selected: false,
// Current tree state // Current tree state
current_state: {}, current_state: {},
@ -314,6 +316,7 @@ _.extend(pgBrowser.browserTreeState, {
} }
// Select the previously selected item // Select the previously selected item
!this.is_selected && pgBrowser.tree.ensureVisible(item, 'center');
this.select_tree_item(item); this.select_tree_item(item);
}, },
@ -372,13 +375,14 @@ _.extend(pgBrowser.browserTreeState, {
treeHierarchy = pgBrowser.tree.getTreeNodeHierarchy(item), treeHierarchy = pgBrowser.tree.getTreeNodeHierarchy(item),
tmpTreeData = treeData[treeHierarchy[this.parent]['_id']]; tmpTreeData = treeData[treeHierarchy[this.parent]['_id']];
if (treeHierarchy.hasOwnProperty('server')) { if (treeHierarchy.hasOwnProperty('server')) {
let selectedItem = treeHierarchy['server']['id']; let selectedItem = treeHierarchy['server']['id'];
if (tmpTreeData && 'selected' in tmpTreeData && selectedItem in tmpTreeData['selected']) { if (tmpTreeData && 'selected' in tmpTreeData && selectedItem in tmpTreeData['selected']) {
if (tmpTreeData['selected'][selectedItem] == data.id) { if (tmpTreeData['selected'][selectedItem] == data.id) {
this.is_selected = true;
pgBrowser.tree.select(item, true, 'center'); pgBrowser.tree.select(item, true, 'center');
pgBrowser.tree.ensureVisible(item, 'center');
} }
} }
} }

4
web/pgadmin/static/js/tree/tree.js
View File

@ -154,8 +154,8 @@ export class Tree {
await item.ensureLoaded(); await item.ensureLoaded();
} }
async ensureVisible(item) { async ensureVisible(item, align='auto') {
await this.tree.ensureVisible(item); await this.tree.ensureVisible(item, align);
} }
async openPath(item) { async openPath(item) {