fix: fix the tab close lose focus

outerbase · Apr 16, 2024 · 223aeaa · 223aeaa
1 parent f6a44cb
commit 223aeaa
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/gui/src/components/query-result-table.tsx b/gui/src/components/query-result-table.tsx
@@ -99,8 +99,6 @@ export default function ResultTable({
   const { openBlockEditor } = useBlockEditor();
   const { databaseDriver } = useDatabaseDriver();
 
-  console.log("henlooooo");
-
   const renderHeader = useCallback(
     (header: OptimizeTableHeaderWithIndexProps) => {
       return (
@@ -477,8 +475,6 @@ export default function ResultTable({
     [copyCallback, pasteCallback]
   );
 
-  console.log("Herer");
-
   return (
     <OptimizeTable
       internalState={data}

diff --git a/gui/src/components/sortable-tab.tsx b/gui/src/components/sortable-tab.tsx
@@ -45,7 +45,10 @@ export const WindowTabItemButton = forwardRef<
       >
         <LucideX
           className={cn("w-3 h-3 grow-0 shrink-0", "libsql-window-close")}
-          onClick={onClose}
+          onClick={(e) => {
+            e.stopPropagation();
+            if (onClose) onClose();
+          }}
         />
       </div>
     </button>

diff --git a/gui/src/components/windows-tab.tsx b/gui/src/components/windows-tab.tsx
@@ -142,7 +142,13 @@ export default function WindowTabs({
                       onSelectChange(idx);
                     }}
                     onClose={() => {
-                      onTabsChange(tabs.filter((t) => t.key !== tab.key));
+                      const newTabs = tabs.filter((t) => t.key !== tab.key);
+
+                      if (selected >= idx) {
+                        onSelectChange(newTabs.length - 1);
+                      }
+
+                      onTabsChange(newTabs);
                     }}
                   />
                 ))}