diff --git a/apps/desktop/src/components/layout/AppTabBar.vue b/apps/desktop/src/components/layout/AppTabBar.vue index 7d650f5363..5af3d9845f 100644 --- a/apps/desktop/src/components/layout/AppTabBar.vue +++ b/apps/desktop/src/components/layout/AppTabBar.vue @@ -2,12 +2,13 @@ import { computed, ref, watch, nextTick, onUnmounted } from "vue"; import type { CSSProperties } from "vue"; import { useI18n } from "vue-i18n"; -import { X, Pin, ChevronDown, Table2, Code2, TableProperties, PencilRuler, KeyRound, Pencil, Package, Lock, Copy, AlertTriangle, Network, Minimize2, Maximize2, Settings, CalendarClock, Activity, Gauge, ShieldCheck, Database, GitBranch } from "@lucide/vue"; +import { X, Pin, ChevronDown, Search, Table2, Code2, TableProperties, PencilRuler, KeyRound, Pencil, Package, Lock, Copy, AlertTriangle, Network, Minimize2, Maximize2, Settings, CalendarClock, Activity, Gauge, ShieldCheck, Database, GitBranch } from "@lucide/vue"; import CustomContextMenu, { type ContextMenuItem } from "@/components/ui/CustomContextMenu.vue"; import { Tooltip, TooltipTrigger, TooltipContent } from "@/components/ui/tooltip"; import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover"; import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog"; import { Button } from "@/components/ui/button"; +import { Input } from "@/components/ui/input"; import DatabaseIcon from "@/components/icons/DatabaseIcon.vue"; import { useConnectionStore } from "@/stores/connectionStore"; import { useQueryStore } from "@/stores/queryStore"; @@ -518,9 +519,25 @@ const showFixedTabScrollbar = computed(() => hasFixedTabOverflow.value && !isWra const showRegularTabOverflowControls = computed(() => regularTabs.value.length > 0 && hasTabOverflow.value && !isWrapLayout.value); const regularTabOverflowOpen = ref(false); const fixedTabOverflowOpen = ref(false); +const tabSearchQuery = ref(""); +const filteredOpenTabs = computed(() => { + const query = tabSearchQuery.value.trim().toLocaleLowerCase(); + if (!query) return queryStore.tabs; + return queryStore.tabs.filter((tab) => tabTitleText(tab).toLocaleLowerCase().includes(query) || tab.title.toLocaleLowerCase().includes(query)); +}); const tabBarClass = computed(() => [isClassicLayout.value ? "bg-muted" : "border-b bg-background", hasFixedTabs.value ? "flex-col" : "", isClassicLayout.value && hasFixedTabs.value ? "border-b" : ""]); const regularTabRowClass = computed(() => [isClassicLayout.value ? "h-9 items-stretch" : "h-10 items-center px-2", isClassicLayout.value && !hasFixedTabs.value ? "border-b" : ""]); +watch(regularTabOverflowOpen, (open) => { + tabSearchQuery.value = ""; + if (open) nextTick(() => document.querySelector('[data-tab-search-input="regular"]')?.focus()); +}); + +watch(fixedTabOverflowOpen, (open) => { + tabSearchQuery.value = ""; + if (open) nextTick(() => document.querySelector('[data-tab-search-input="fixed"]')?.focus()); +}); + function tabMenuIcon(tab: QueryTab) { if (tab.externalSqlFileMissing) return AlertTriangle; if (tab.mode === "data" || tab.mode === "mongo" || tab.mode === "redis" || tab.mode === "hbase") return Table2; @@ -794,40 +811,47 @@ function onOverflowItemKeydown(event: KeyboardEvent, tabId: string, kind: "regul - - - - + +
+ + +
+
+ + + +

{{ t("tabs.noMatchingTabs") }}

+
@@ -935,44 +959,51 @@ function onOverflowItemKeydown(event: KeyboardEvent, tabId: string, kind: "regul
- - - - - + +
+ + +
+
+ + + +

{{ t("tabs.noMatchingTabs") }}

+
diff --git a/apps/desktop/src/components/layout/__tests__/AppTabBar.spec.ts b/apps/desktop/src/components/layout/__tests__/AppTabBar.spec.ts index c672a7365d..8a8042114d 100644 --- a/apps/desktop/src/components/layout/__tests__/AppTabBar.spec.ts +++ b/apps/desktop/src/components/layout/__tests__/AppTabBar.spec.ts @@ -66,3 +66,19 @@ describe("AppTabBar right-side close action", () => { expect(tabBarSource).toMatch(/emit\("close-driver-store"\);\s*if \(shouldActivateSettings\) emit\("activate-settings-page"\);/); }); }); + +describe("AppTabBar overflow search", () => { + it("filters every open tab by its display and source titles", () => { + expect(tabBarSource).toContain('const tabSearchQuery = ref("");'); + expect(tabBarSource).toContain("const filteredOpenTabs = computed(() => {"); + expect(tabBarSource).toContain("return queryStore.tabs.filter((tab) => tabTitleText(tab).toLocaleLowerCase().includes(query) || tab.title.toLocaleLowerCase().includes(query));"); + }); + + it("provides the same focused search control and empty state in both overflow menus", () => { + expect(tabBarSource.match(/