diff --git a/apps/desktop/src/components/layout/AppTabBar.vue b/apps/desktop/src/components/layout/AppTabBar.vue index 2e3c4ff721..95ceaa7979 100644 --- a/apps/desktop/src/components/layout/AppTabBar.vue +++ b/apps/desktop/src/components/layout/AppTabBar.vue @@ -4,10 +4,10 @@ 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 } from "@lucide/vue"; import CustomContextMenu, { type ContextMenuItem } from "@/components/ui/CustomContextMenu.vue"; -import LightDropdown from "@/components/ui/LightDropdown.vue"; import { Tooltip, TooltipTrigger, TooltipContent } from "@/components/ui/tooltip"; import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog"; import { Button } from "@/components/ui/button"; +import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover"; import { useQueryStore } from "@/stores/queryStore"; import { useSettingsStore } from "@/stores/settingsStore"; import { useTabScroll } from "@/composables/useTabScroll"; @@ -274,26 +274,8 @@ function tabIconClass(tab: QueryTab) { const showRegularTabScrollbar = computed(() => hasTabOverflow.value); const showFixedTabScrollbar = computed(() => hasFixedTabOverflow.value); const showRegularTabOverflowControls = computed(() => regularTabs.value.length > 0 && hasTabOverflow.value); - -const openTabMenuItems = computed(() => - queryStore.tabs.map((tab) => ({ - value: tab.id, - label: tabDisplayTitle(tab, t), - title: tabDisplayTitle(tab, t), - icon: tabMenuIcon(tab), - iconClass: tabIconClass(tab), - })), -); - -const fixedTabMenuItems = computed(() => - fixedTabs.value.map((tab) => ({ - value: tab.id, - label: tabDisplayTitle(tab, t), - title: tabDisplayTitle(tab, t), - icon: tabMenuIcon(tab), - iconClass: tabIconClass(tab), - })), -); +const regularTabOverflowOpen = ref(false); +const fixedTabOverflowOpen = ref(false); function tabMenuIcon(tab: QueryTab) { if (tab.mode === "data" || tab.mode === "mongo" || tab.mode === "redis") return Table2; @@ -374,6 +356,24 @@ function activateTab(tabId: string) { queryStore.activeTabId = tabId; emit("activate-tab"); } + +function activateTabFromOverflow(tabId: string, kind: "regular" | "fixed") { + activateTab(tabId); + if (kind === "regular") regularTabOverflowOpen.value = false; + else fixedTabOverflowOpen.value = false; +} + +function closeTabFromOverflow(tabId: string, event: MouseEvent) { + event.preventDefault(); + event.stopPropagation(); + queryStore.closeTab(tabId); +} + +function onOverflowItemKeydown(event: KeyboardEvent, tabId: string, kind: "regular" | "fixed") { + if (event.key !== "Enter" && event.key !== " ") return; + event.preventDefault(); + activateTabFromOverflow(tabId, kind); +}