Fix new tab selection when closing one

benja-M-1 · benja-M-1 · commit 31a8ef08d449 · 2023-01-04T13:48:36.000+01:00
diff --git a/ui/src/components/DatabaseViewerDialog.tsx b/ui/src/components/DatabaseViewerDialog.tsx
@@ -62,7 +62,7 @@ export default function DatabaseViewerDialog({
   }
 
   const handleCloseTab = (event, tab: string) => {
-    event.preventDefault();
+    event.stopPropagation();
 
     const index = tabs.findIndex(t => t.name === tab);
 
@@ -77,14 +77,13 @@ export default function DatabaseViewerDialog({
       return;
     }
 
-
     if (selectedTab === tab) {
-      let newlySelectedTab = tabs[index + 1].name;
+      let newlySelectedTabIndex = index + 1;
       if (index === tabs.length - 1) {
-        newlySelectedTab = tabs[index - 1].name;
+        newlySelectedTabIndex = index - 1;
       }
 
-      setSelectedTab(newlySelectedTab);
+      setSelectedTab(tabs[newlySelectedTabIndex].name);
     }
 
     setTabs(tabs.filter(t => t.name !== tab));

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ export default function DatabaseViewerDialog({`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`const handleCloseTab = (event, tab: string) => {`
`65`		`- event.preventDefault();`
	`65`	`+ event.stopPropagation();`
`66`	`66`
`67`	`67`	`const index = tabs.findIndex(t => t.name === tab);`
`68`	`68`
`@@ -77,14 +77,13 @@ export default function DatabaseViewerDialog({`
`77`	`77`	`return;`
`78`	`78`	`}`
`79`	`79`
`80`		`-`
`81`	`80`	`if (selectedTab === tab) {`
`82`		`- let newlySelectedTab = tabs[index + 1].name;`
	`81`	`+ let newlySelectedTabIndex = index + 1;`
`83`	`82`	`if (index === tabs.length - 1) {`
`84`		`- newlySelectedTab = tabs[index - 1].name;`
	`83`	`+ newlySelectedTabIndex = index - 1;`
`85`	`84`	`}`
`86`	`85`
`87`		`- setSelectedTab(newlySelectedTab);`
	`86`	`+ setSelectedTab(tabs[newlySelectedTabIndex].name);`
`88`	`87`	`}`
`89`	`88`
`90`	`89`	`setTabs(tabs.filter(t => t.name !== tab));`