dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-29 16:53:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed closing tabs

Browse Source
This commit is contained in:
Jan Prochazka
2021-01-24 09:58:58 +01:00
parent e561bf38f6
commit 69fd9bbc67
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/web/src/TabsPanel.js
View File

@@ -159,6 +159,10 @@ export default function TabsPanel() {
closedTime: x.closedTime || (closeCondition(x, active) ? new Date().getTime() : undefined), closedTime: x.closedTime || (closeCondition(x, active) ? new Date().getTime() : undefined),
})); }));
if (newFiles.find(x => x.selected && x.closedTime == null)) {
return newFiles;
}
while (selectedIndex >= 0 && newFiles[selectedIndex].closedTime) selectedIndex -= 1; while (selectedIndex >= 0 && newFiles[selectedIndex].closedTime) selectedIndex -= 1;
if (selectedIndex < 0) { if (selectedIndex < 0) {
@@ -166,14 +170,18 @@ export default function TabsPanel() {
while (selectedIndex < newFiles.length && newFiles[selectedIndex].closedTime) selectedIndex += 1; while (selectedIndex < newFiles.length && newFiles[selectedIndex].closedTime) selectedIndex += 1;
} }
if (selectedIndex != lastSelectedIndex) { if (selectedIndex < 0 || selectedIndex >= newFiles.length)
selectedIndex = _.findIndex(newFiles, x => x.closedTime == null);
return newFiles.map((x, index) => ({ return newFiles.map((x, index) => ({
...x, ...x,
selected: index == selectedIndex, selected: index == selectedIndex,
})); }));
}
return newFiles; // if (selectedIndex != lastSelectedIndex) {
// }
// return newFiles;
}); });
}; };