Skip to content

armgit / dbx

Public Imported from GitHub
0

25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。

feat(tabs): add option to restrict connection color to active tab (#12955) (#12990)

lxk955b56c03157741
diff --git a/apps/desktop/src/components/editor/EditorSettingsDialog.vue b/apps/desktop/src/components/editor/EditorSettingsDialog.vue
index 02ea0dc4e4..3c1b35f455 100644
--- a/apps/desktop/src/components/editor/EditorSettingsDialog.vue
+++ b/apps/desktop/src/components/editor/EditorSettingsDialog.vue
@@ -106,6 +106,7 @@ import {
type TabGroupMode,
type TabGroupRowMode,
type TabPlacement,
+ type ConnectionTabColorScope,
type TabSortMode,
type WelcomePageMode,
type UpdateDownloadSource,
@@ -798,6 +799,7 @@ const editWebLogoPosition = ref<WebLogoPosition>(settingsStore.editorSettings.we
const editTabLayout = ref(settingsStore.editorSettings.tabLayout);
const editTabPlacement = ref<TabPlacement>(settingsStore.editorSettings.tabPlacement);
const editColorizeConnectionTabs = ref(settingsStore.editorSettings.colorizeConnectionTabs);
+const editColorizeConnectionTabsScope = ref<ConnectionTabColorScope>(settingsStore.editorSettings.colorizeConnectionTabsScope);
const editTabGroupMode = ref<TabGroupMode>(settingsStore.editorSettings.tabGroupMode);
const editTabSortMode = ref<TabSortMode>(settingsStore.editorSettings.tabSortMode);
const editTabMaxWidth = ref<number>(settingsStore.editorSettings.tabMaxWidth);
@@ -1197,6 +1199,7 @@ function currentEditorSettingsDraft(): EditorSettingsDraft {
tabLayout: editTabLayout.value,
tabPlacement: editTabPlacement.value,
colorizeConnectionTabs: editColorizeConnectionTabs.value,
+ colorizeConnectionTabsScope: editColorizeConnectionTabsScope.value,
tabGroupMode: editTabGroupMode.value,
tabSortMode: editTabSortMode.value,
tabMaxWidth: editTabMaxWidth.value,
@@ -1895,6 +1898,7 @@ function syncEditorSettingsDraftFromStore() {
editTabLayout.value = settingsStore.editorSettings.tabLayout;
editTabPlacement.value = settingsStore.editorSettings.tabPlacement;
editColorizeConnectionTabs.value = settingsStore.editorSettings.colorizeConnectionTabs;
+ editColorizeConnectionTabsScope.value = settingsStore.editorSettings.colorizeConnectionTabsScope;
editTabGroupMode.value = settingsStore.editorSettings.tabGroupMode;
editTabSortMode.value = settingsStore.editorSettings.tabSortMode;
editTabMaxWidth.value = settingsStore.editorSettings.tabMaxWidth;
@@ -2067,6 +2071,7 @@ const editorSettingsDraftRefs: EditorSettingsDraftRefMap = {
tabLayout: editTabLayout,
tabPlacement: editTabPlacement,
colorizeConnectionTabs: editColorizeConnectionTabs,
+ colorizeConnectionTabsScope: editColorizeConnectionTabsScope,
tabGroupMode: editTabGroupMode,
tabSortMode: editTabSortMode,
tabMaxWidth: editTabMaxWidth,
@@ -2672,6 +2677,7 @@ function resetDefaultsForTab(tab: SettingsCategory) {
editTabLayout.value = DEFAULT_EDITOR_SETTINGS.tabLayout;
editTabPlacement.value = DEFAULT_EDITOR_SETTINGS.tabPlacement;
editColorizeConnectionTabs.value = DEFAULT_EDITOR_SETTINGS.colorizeConnectionTabs;
+ editColorizeConnectionTabsScope.value = DEFAULT_EDITOR_SETTINGS.colorizeConnectionTabsScope;
editTabGroupMode.value = DEFAULT_EDITOR_SETTINGS.tabGroupMode;
editTabSortMode.value = DEFAULT_EDITOR_SETTINGS.tabSortMode;
editTabMaxWidth.value = DEFAULT_EDITOR_SETTINGS.tabMaxWidth;
@@ -8600,12 +8606,32 @@ onUnmounted(() => {
</div>
</div>
- <div class="settings-item flex items-center justify-between gap-4 rounded-md border bg-muted/20 px-3 py-2">
- <div class="space-y-1">
- <Label for="colorize-connection-tabs">{{ t("settings.colorizeConnectionTabs") }}</Label>
- <p class="text-xs text-muted-foreground">{{ t("settings.colorizeConnectionTabsDescription") }}</p>
+ <div class="settings-item rounded-md border bg-muted/20 px-3 py-2">
+ <div :class="editColorizeConnectionTabs ? 'grid gap-4 md:grid-cols-2' : ''">
+ <div class="flex min-w-0 items-start justify-between gap-4">
+ <div class="min-w-0 space-y-1">
+ <Label for="colorize-connection-tabs">{{ t("settings.colorizeConnectionTabs") }}</Label>
+ <p class="text-xs text-muted-foreground">{{ t("settings.colorizeConnectionTabsDescription") }}</p>
+ </div>
+ <Switch id="colorize-connection-tabs" v-model="editColorizeConnectionTabs" class="mt-0.5" />
+ </div>
+
+ <div v-if="editColorizeConnectionTabs" class="flex min-w-0 items-start justify-between gap-4 border-t pt-4 md:border-l md:border-t-0 md:pl-4 md:pt-0">
+ <div class="min-w-0 space-y-1">
+ <Label for="colorize-connection-tabs-scope">{{ t("settings.colorizeConnectionTabsScope") }}</Label>
+ <p class="text-xs text-muted-foreground">{{ t("settings.colorizeConnectionTabsScopeDescription") }}</p>
+ </div>
+ <Select v-model="editColorizeConnectionTabsScope">
+ <SelectTrigger id="colorize-connection-tabs-scope" class="h-8 w-44 shrink-0">
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ <SelectItem value="all">{{ t("settings.colorizeConnectionTabsScopeAll") }}</SelectItem>
+ <SelectItem value="active">{{ t("settings.colorizeConnectionTabsScopeActive") }}</SelectItem>
+ </SelectContent>
+ </Select>
+ </div>
</div>
- <Switch id="colorize-connection-tabs" v-model="editColorizeConnectionTabs" />
</div>
<div class="settings-appearance-group">
diff --git a/apps/desktop/src/components/layout/EditorGroupTabBar.vue b/apps/desktop/src/components/layout/EditorGroupTabBar.vue
index 44a40bd3a9..b3f6d187f9 100644
--- a/apps/desktop/src/components/layout/EditorGroupTabBar.vue
+++ b/apps/desktop/src/components/layout/EditorGroupTabBar.vue
@@ -1330,6 +1330,7 @@ function tabColorStyle(tab: QueryTab): CSSProperties | undefined {
if (isVerticalLayout.value) {
if (settingsStore.editorSettings.tabGroupMode !== "none" || !settingsStore.editorSettings.colorizeConnectionTabs) return undefined;
const active = isTabActive(tab);
+ if (settingsStore.editorSettings.colorizeConnectionTabsScope === "active" && !active) return undefined;
const color = tabConnectionColor(tab.connectionId);
return {
"--app-tab-background": hexToRgba(color, active ? 0.24 : 0.09),
@@ -1343,6 +1344,7 @@ function tabColorStyle(tab: QueryTab): CSSProperties | undefined {
} as CSSProperties;
}
if (!isTabActive(tab)) {
+ if (settingsStore.editorSettings.colorizeConnectionTabsScope === "active") return undefined;
// Grouped horizontal tabs already show the group identity on the header
// and rail (the connection color when grouping by connection), so keep
// their washes quiet to make the active tab easy to spot (issue #12485).
diff --git a/apps/desktop/src/components/layout/__tests__/EditorGroupTabBar.groups.spec.ts b/apps/desktop/src/components/layout/__tests__/EditorGroupTabBar.groups.spec.ts
index afea164ff0..a392783512 100644
--- a/apps/desktop/src/components/layout/__tests__/EditorGroupTabBar.groups.spec.ts
+++ b/apps/desktop/src/components/layout/__tests__/EditorGroupTabBar.groups.spec.ts
@@ -307,6 +307,14 @@ describe("EditorGroupTabBar group behavior", () => {
expect(activeBackground).toBe("rgba(59, 130, 246, 0.24)");
}
+ // Restricting connection-tab colors to active tab silences the inactive wash.
+ settings.editorSettings.colorizeConnectionTabsScope = "active";
+ await settle();
+ expect(host.querySelector<HTMLElement>(`[data-tab-id="${configuredTabId}"]`)!.style.getPropertyValue("--app-tab-background")).toBe("");
+ expect(host.querySelector<HTMLElement>(`[data-tab-id="${activeTabId}"]`)!.style.getPropertyValue("--app-tab-background")).toBe("rgba(59, 130, 246, 0.24)");
+ settings.editorSettings.colorizeConnectionTabsScope = "all";
+ await settle();
+
// Turning the connection-tab colors off must silence the inactive wash
// even for a configured connection color.
settings.editorSettings.colorizeConnectionTabs = false;
@@ -378,6 +386,16 @@ describe("EditorGroupTabBar group behavior", () => {
expect(inactiveTab.style.getPropertyValue("--app-tab-hover-background")).toBe("rgba(59, 130, 246, 0.16)");
expect(inactiveTab.style.borderColor).toBe("rgba(59, 130, 246, 0.18)");
+ // Restricting connection-tab colors to active tab keeps active accents but removes inactive styles.
+ settings.editorSettings.colorizeConnectionTabsScope = "active";
+ await settle();
+ expect(tab.style.getPropertyValue("--app-tab-background")).toBe("rgba(34, 197, 94, 0.24)");
+ expect(tab.style.getPropertyValue("--app-tab-active-border")).toBe("rgba(34, 197, 94, 0.72)");
+ expect(tab.style.getPropertyValue("--app-tab-active-accent")).toBe("#22c55e");
+ expect(inactiveTab.style.getPropertyValue("--app-tab-background")).toBe("");
+ expect(inactiveTab.style.getPropertyValue("--app-tab-hover-background")).toBe("");
+ expect(inactiveTab.style.borderColor).toBe("");
+
settings.editorSettings.colorizeConnectionTabs = false;
await settle();
expect(tab.style.getPropertyValue("--app-tab-background")).toBe("");
diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts
index 350ecac5b9..56cc2a5dc6 100644
--- a/apps/desktop/src/i18n/locales/en.ts
+++ b/apps/desktop/src/i18n/locales/en.ts
@@ -9234,6 +9234,10 @@ export default {
tabLayoutWrapDescription: "Tabs wrap to multiple rows to show all at once.",
colorizeConnectionTabs: "Color tabs by connection",
colorizeConnectionTabsDescription: "Use each connection’s configured color for editor tabs.",
+ colorizeConnectionTabsScope: "Tab color scope",
+ colorizeConnectionTabsScopeDescription: "Choose whether connection colors apply to all tabs or only the active tab.",
+ colorizeConnectionTabsScopeAll: "All tabs",
+ colorizeConnectionTabsScopeActive: "Active tab only",
tabPlacement: "Tab bar position",
tabPlacementTop: "Top",
tabPlacementBottom: "Bottom",
diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts
index 3e04e21637..a9a25b3f91 100644
--- a/apps/desktop/src/i18n/locales/es.ts
+++ b/apps/desktop/src/i18n/locales/es.ts
@@ -8244,6 +8244,10 @@ export default withEnglishFallback({
tabLayoutWrapDescription: "Las pestañas se ajustan en varias filas para mostrarlas todas.",
colorizeConnectionTabs: "Colorear pestañas por conexión",
colorizeConnectionTabsDescription: "Usar el color configurado de cada conexión para las pestañas del editor.",
+ colorizeConnectionTabsScope: "Ámbito de color de pestañas",
+ colorizeConnectionTabsScopeDescription: "Controla si los colores de conexión se aplican a todas las pestañas o solo a la activa.",
+ colorizeConnectionTabsScopeAll: "Todas las pestañas",
+ colorizeConnectionTabsScopeActive: "Solo pestaña activa",
tabPlacement: "Posición de la barra de pestañas",
tabPlacementTop: "Arriba",
tabPlacementBottom: "Abajo",
diff --git a/apps/desktop/src/i18n/locales/id.ts b/apps/desktop/src/i18n/locales/id.ts
index 0c49b08df7..ab9e3d3b21 100644
--- a/apps/desktop/src/i18n/locales/id.ts
+++ b/apps/desktop/src/i18n/locales/id.ts
@@ -8345,6 +8345,10 @@ export default withEnglishFallback({
tabLayoutWrapDescription: "Tab dilipat ke beberapa baris agar semua terlihat sekaligus.",
colorizeConnectionTabs: "Warnai tab berdasarkan koneksi",
colorizeConnectionTabsDescription: "Gunakan warna yang dikonfigurasi untuk setiap koneksi pada tab editor.",
+ colorizeConnectionTabsScope: "Cakupan warna tab",
+ colorizeConnectionTabsScopeDescription: "Pilih apakah warna koneksi diterapkan ke semua tab atau hanya tab yang aktif.",
+ colorizeConnectionTabsScopeAll: "Semua tab",
+ colorizeConnectionTabsScopeActive: "Hanya tab aktif",
tabPlacement: "Posisi bilah tab",
tabPlacementTop: "Atas",
tabPlacementBottom: "Bawah",
diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts
index 52a6c8ee43..ac444260a9 100644
--- a/apps/desktop/src/i18n/locales/it.ts
+++ b/apps/desktop/src/i18n/locales/it.ts
@@ -8023,6 +8023,10 @@ export default withEnglishFallback({
tabLayoutWrapDescription: "Le schede vanno a capo su più righe per mostrarle tutte.",
colorizeConnectionTabs: "Colora le schede in base alla connessione",
colorizeConnectionTabsDescription: "Usa il colore configurato di ogni connessione per le schede dell'editor.",
+ colorizeConnectionTabsScope: "Ambito colore schede",
+ colorizeConnectionTabsScopeDescription: "Scegli se i colori di connessione si applicano a tutte le schede o solo a quella attiva.",
+ colorizeConnectionTabsScopeAll: "Tutte le schede",
+ colorizeConnectionTabsScopeActive: "Solo scheda attiva",
tabPlacement: "Posizione barra schede",
tabPlacementTop: "In alto",
tabPlacementBottom: "In basso",
diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts
index 1c4a0058fa..07fd5b1bda 100644
--- a/apps/desktop/src/i18n/locales/ja.ts
+++ b/apps/desktop/src/i18n/locales/ja.ts
@@ -8051,6 +8051,10 @@ export default withEnglishFallback({
tabLayoutWrapDescription: "タブが1行に収まらないとき折り返してすべて表示します。",
colorizeConnectionTabs: "接続ごとにタブを色分け",
colorizeConnectionTabsDescription: "各接続に設定された色をエディターのタブに使用します。",
+ colorizeConnectionTabsScope: "タブの配色範囲",
+ colorizeConnectionTabsScopeDescription: "接続色をすべてのタブに適用するか、アクティブなタブにのみ適用するかを制御します。",
+ colorizeConnectionTabsScopeAll: "すべてのタブ",
+ colorizeConnectionTabsScopeActive: "アクティブなタブのみ",
tabPlacement: "タブバーの位置",
tabPlacementTop: "上",
tabPlacementBottom: "下",
diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.ts
index cf0480de09..097d89f21f 100644
--- a/apps/desktop/src/i18n/locales/ko.ts
+++ b/apps/desktop/src/i18n/locales/ko.ts
@@ -7987,6 +7987,10 @@ export default withEnglishFallback({
tabLayoutWrapDescription: "탭이 여러 행으로 줄바꿈되어 모두 한 번에 표시됩니다.",
colorizeConnectionTabs: "연결별로 탭 색상 표시",
colorizeConnectionTabsDescription: "각 연결에 설정된 색상을 편집기 탭에 사용합니다.",
+ colorizeConnectionTabsScope: "탭 색상 적용 범위",
+ colorizeConnectionTabsScopeDescription: "연결 색상을 모든 탭에 적용할지 또는 활성 탭에만 적용할지 설정합니다.",
+ colorizeConnectionTabsScopeAll: "모든 탭",
+ colorizeConnectionTabsScopeActive: "활성 탭만",
tabPlacement: "탭 표시줄 위치",
tabPlacementTop: "위쪽",
tabPlacementBottom: "아래쪽",
diff --git a/apps/desktop/src/i18n/locales/pl.ts b/apps/desktop/src/i18n/locales/pl.ts
index 1913a57f9b..c402681d53 100644
--- a/apps/desktop/src/i18n/locales/pl.ts
+++ b/apps/desktop/src/i18n/locales/pl.ts
@@ -8416,6 +8416,10 @@ export default withEnglishFallback({
tabLayoutWrapDescription: "Karty zawijają się do wielu wierszy, aby pokazać wszystkie naraz.",
colorizeConnectionTabs: "Koloruj karty według połączenia",
colorizeConnectionTabsDescription: "Używaj skonfigurowanego koloru połączenia dla kart edytora.",
+ colorizeConnectionTabsScope: "Zakres kolorowania kart",
+ colorizeConnectionTabsScopeDescription: "Określ, czy kolory połączeń mają być stosowane do wszystkich kart, czy tylko do aktywnej.",
+ colorizeConnectionTabsScopeAll: "Wszystkie karty",
+ colorizeConnectionTabsScopeActive: "Tylko aktywna karta",
tabPlacement: "Pozycja paska kart",
tabPlacementTop: "Góra",
tabPlacementBottom: "Dół",
diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts
index ebe1162caf..d187eb82c5 100644
--- a/apps/desktop/src/i18n/locales/pt-BR.ts
+++ b/apps/desktop/src/i18n/locales/pt-BR.ts
@@ -8022,6 +8022,10 @@ export default withEnglishFallback({
tabLayoutWrapDescription: "As abas quebram em múltiplas linhas para exibir todas.",
colorizeConnectionTabs: "Colorir abas por conexão",
colorizeConnectionTabsDescription: "Usar a cor configurada de cada conexão nas abas do editor.",
+ colorizeConnectionTabsScope: "Escopo de cores das abas",
+ colorizeConnectionTabsScopeDescription: "Controla se as cores de conexão se aplicam a todas as abas ou apenas à ativa.",
+ colorizeConnectionTabsScopeAll: "Todas as abas",
+ colorizeConnectionTabsScopeActive: "Apenas aba ativa",
tabPlacement: "Posição da barra de abas",
tabPlacementTop: "Superior",
tabPlacementBottom: "Inferior",
diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.ts
index bce6ceeb86..301540df40 100644
--- a/apps/desktop/src/i18n/locales/ru.ts
+++ b/apps/desktop/src/i18n/locales/ru.ts
@@ -9442,6 +9442,10 @@ export default withEnglishFallback({
tabLayoutWrapDescription: "Вкладки переносятся на несколько строк, показывая все сразу.",
colorizeConnectionTabs: "Раскрашивать вкладки по подключению",
colorizeConnectionTabsDescription: "Использовать настроенный цвет каждого подключения для вкладок редактора.",
+ colorizeConnectionTabsScope: "Область окрашивания вкладок",
+ colorizeConnectionTabsScopeDescription: "Определяет, применять ли цвет подключения ко всем вкладкам или только к активной.",
+ colorizeConnectionTabsScopeAll: "Все вкладки",
+ colorizeConnectionTabsScopeActive: "Только активная вкладка",
tabPlacement: "Расположение панели вкладок",
tabPlacementTop: "Сверху",
tabPlacementBottom: "Снизу",
diff --git a/apps/desktop/src/i18n/locales/th.ts b/apps/desktop/src/i18n/locales/th.ts
index f6a9ea48f3..17ba898517 100644
--- a/apps/desktop/src/i18n/locales/th.ts
+++ b/apps/desktop/src/i18n/locales/th.ts
@@ -9877,6 +9877,10 @@ export default withEnglishFallback({
tabLayoutWrapDescription: "เมื่อแท็บล้นแถว ให้ขึ้นแถวใหม่เพื่อแสดงทุกแท็บพร้อมกัน",
colorizeConnectionTabs: "กำหนดสีแท็บตามการเชื่อมต่อ",
colorizeConnectionTabsDescription: "ใช้สีที่กำหนดของแต่ละการเชื่อมต่อกับแท็บ Editor",
+ colorizeConnectionTabsScope: "ขอบเขตการกำหนดสีแท็บ",
+ colorizeConnectionTabsScopeDescription: "กำหนดว่าจะใช้สีการเชื่อมต่อกับทุกแท็บหรือเฉพาะแท็บที่เปิดใช้งานอยู่",
+ colorizeConnectionTabsScopeAll: "ทุกแท็บ",
+ colorizeConnectionTabsScopeActive: "เฉพาะแท็บที่เปิดใช้งาน",
tabPlacement: "ตำแหน่งแถบแท็บ",
tabPlacementTop: "ด้านบน",
tabPlacementBottom: "ด้านล่าง",
diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts
index 22db29c5c0..d894131e42 100644
--- a/apps/desktop/src/i18n/locales/zh-CN.ts
+++ b/apps/desktop/src/i18n/locales/zh-CN.ts
@@ -9202,6 +9202,10 @@ export default withEnglishFallback({
tabLayoutWrapDescription: "标签页超出一行时自动换行,平铺显示所有标签。",
colorizeConnectionTabs: "按连接颜色区分标签页",
colorizeConnectionTabsDescription: "使用连接配置的颜色显示编辑器标签页。",
+ colorizeConnectionTabsScope: "标签页颜色应用范围",
+ colorizeConnectionTabsScopeDescription: "控制是将连接颜色应用到所有标签页还是仅应用到当前激活的标签页。",
+ colorizeConnectionTabsScopeAll: "所有标签页",
+ colorizeConnectionTabsScopeActive: "仅激活标签页",
tabPlacement: "标签栏位置",
tabPlacementTop: "上方",
tabPlacementBottom: "下方",
diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts
index c8d42474e0..a209fbcd81 100644
--- a/apps/desktop/src/i18n/locales/zh-TW.ts
+++ b/apps/desktop/src/i18n/locales/zh-TW.ts
@@ -7369,6 +7369,10 @@ export default withEnglishFallback({
tabLayoutWrapDescription: "標籤頁超出一行時自動換行,平鋪顯示所有標籤。",
colorizeConnectionTabs: "依連線顏色區分分頁",
colorizeConnectionTabsDescription: "使用每個連線設定的顏色顯示編輯器分頁。",
+ colorizeConnectionTabsScope: "分頁顏色套用範圍",
+ colorizeConnectionTabsScopeDescription: "控制是將連線顏色套用到所有分頁還是僅套用到目前啟用的分頁。",
+ colorizeConnectionTabsScopeAll: "所有分頁",
+ colorizeConnectionTabsScopeActive: "僅啟用分頁",
tabPlacement: "標籤欄位置",
tabPlacementTop: "上方",
tabPlacementBottom: "下方",
diff --git a/apps/desktop/src/lib/__tests__/tabs/tabPresentation.spec.ts b/apps/desktop/src/lib/__tests__/tabs/tabPresentation.spec.ts
index c982f1585d..5a9a8ac971 100644
--- a/apps/desktop/src/lib/__tests__/tabs/tabPresentation.spec.ts
+++ b/apps/desktop/src/lib/__tests__/tabs/tabPresentation.spec.ts
@@ -1033,6 +1033,30 @@ describe("shared tab presentation helpers", () => {
}
});
+ it("restricts connection tab coloring to active tab when scope is active (#12955)", () => {
+ const settings = useSettingsStore().editorSettings;
+ const connectionStore = useConnectionStore();
+ connectionStore.connections = [{ id: "conn-1", name: "One", db_type: "mysql", color: "#3b82f6" }] as ConnectionConfig[];
+ const tab = queryTab({ connectionId: "conn-1" });
+
+ settings.colorizeConnectionTabs = true;
+ settings.colorizeConnectionTabsScope = "all";
+ const activeAll = tabColorStyle(tab, true, false);
+ const inactiveAll = tabColorStyle(tab, false, false);
+ expect(activeAll?.["--app-tab-background"]).toBe("rgba(59, 130, 246, 0.24)");
+ expect(activeAll?.borderColor).toBe("rgba(59, 130, 246, 0.72)");
+ expect(inactiveAll?.["--app-tab-background"]).toBe("rgba(59, 130, 246, 0.09)");
+ expect(inactiveAll?.borderColor).toBe("rgba(59, 130, 246, 0.18)");
+
+ settings.colorizeConnectionTabsScope = "active";
+ const activeScope = tabColorStyle(tab, true, false);
+ const inactiveScope = tabColorStyle(tab, false, false);
+ expect(activeScope?.["--app-tab-background"]).toBe("rgba(59, 130, 246, 0.24)");
+ expect(activeScope?.borderColor).toBe("rgba(59, 130, 246, 0.72)");
+ expect(inactiveScope?.borderColor).toBeUndefined();
+ expect(inactiveScope?.["--app-tab-background"]).toBeUndefined();
+ });
+
it("swaps inline color-mix tab colors for concrete rgba on legacy WebViews", () => {
useSettingsStore().editorSettings.colorizeConnectionTabs = false;
// WebKit without color-mix() invalidates the inline values at computed-value
diff --git a/apps/desktop/src/lib/settings/__tests__/editorSettingsDraft.spec.ts b/apps/desktop/src/lib/settings/__tests__/editorSettingsDraft.spec.ts
index 1a2ea5b0bf..40bbe24313 100644
--- a/apps/desktop/src/lib/settings/__tests__/editorSettingsDraft.spec.ts
+++ b/apps/desktop/src/lib/settings/__tests__/editorSettingsDraft.spec.ts
@@ -84,6 +84,12 @@ describe("EDITOR_SETTINGS_DRAFT_KEYS", () => {
expect(draft.queryResultExportFileNameSource).toBe("tab-title");
});
+ it("includes colorizeConnectionTabsScope (#12955)", () => {
+ expect(EDITOR_SETTINGS_DRAFT_KEYS).toContain("colorizeConnectionTabsScope");
+ const draft = editorSettingsDraftFromSettings(makeSettings({ colorizeConnectionTabsScope: "active" } as Partial<EditorSettings>));
+ expect(draft.colorizeConnectionTabsScope).toBe("active");
+ });
+
it("includes continueOnErrorOnBatch", () => {
expect(EDITOR_SETTINGS_DRAFT_KEYS).toContain("continueOnErrorOnBatch");
});
diff --git a/apps/desktop/src/lib/settings/editorSettingsDraft.ts b/apps/desktop/src/lib/settings/editorSettingsDraft.ts
index 9834771352..4176eb9690 100644
--- a/apps/desktop/src/lib/settings/editorSettingsDraft.ts
+++ b/apps/desktop/src/lib/settings/editorSettingsDraft.ts
@@ -57,6 +57,7 @@ export const EDITOR_SETTINGS_DRAFT_KEYS = [
"tabLayout",
"tabPlacement",
"colorizeConnectionTabs",
+ "colorizeConnectionTabsScope",
"tabGroupMode",
"tabSortMode",
"tabMaxWidth",
@@ -209,6 +210,7 @@ function normalizedDraftValue(key: EditorSettingsDraftKey, value: unknown): unkn
if (key === "snippetTriggerKey") return value === "space" || value === "both" ? value : "tab";
if (key === "webLogoPosition") return value === "right" || value === "hidden" ? value : "left";
if (key === "aiSqlApplyTargetMode") return normalizeAiSqlApplyTargetMode(value);
+ if (key === "colorizeConnectionTabsScope") return value === "active" ? "active" : "all";
return value;
}
diff --git a/apps/desktop/src/lib/settings/settingsSearch.ts b/apps/desktop/src/lib/settings/settingsSearch.ts
index b9e2e89672..55fbb22298 100644
--- a/apps/desktop/src/lib/settings/settingsSearch.ts
+++ b/apps/desktop/src/lib/settings/settingsSearch.ts
@@ -322,7 +322,14 @@ export const SETTINGS_SEARCH_DEFINITIONS: readonly SettingsSearchDefinition[] =
targetId: "appearance",
keywordKeys: ["settings.tabMaxWidthUnlimited", "settings.tabMaxWidthCompact", "settings.tabMaxWidthMedium", "settings.tabMaxWidthStandard", "settings.tabMaxWidthWide"],
},
- { id: "appearance-connection-tab-colors", category: "appearance", titleKey: "settings.colorizeConnectionTabs", descriptionKey: "settings.colorizeConnectionTabsDescription", targetId: "appearance" },
+ {
+ id: "appearance-connection-tab-colors",
+ category: "appearance",
+ titleKey: "settings.colorizeConnectionTabs",
+ descriptionKey: "settings.colorizeConnectionTabsDescription",
+ targetId: "appearance",
+ keywordKeys: ["settings.colorizeConnectionTabsScope", "settings.colorizeConnectionTabsScopeAll", "settings.colorizeConnectionTabsScopeActive"],
+ },
{ id: "appearance-icons", category: "appearance", titleKey: "settings.iconTheme", targetId: "appearance", visible: desktopOnly },
{
id: "appearance-web-logo-position",
diff --git a/apps/desktop/src/lib/settings/settingsTransfer.ts b/apps/desktop/src/lib/settings/settingsTransfer.ts
index a619f3a5e7..5c0fdd1a35 100644
--- a/apps/desktop/src/lib/settings/settingsTransfer.ts
+++ b/apps/desktop/src/lib/settings/settingsTransfer.ts
@@ -124,6 +124,7 @@ const SETTINGS_TRANSFER_CATEGORY_KEYS: Record<SettingsTransferCategoryId, readon
"tabPlacement",
"tabGroupMode",
"colorizeConnectionTabs",
+ "colorizeConnectionTabsScope",
"tabSortMode",
"tabMaxWidth",
"tabGroupRows",
diff --git a/apps/desktop/src/lib/tabs/tabPresentation.ts b/apps/desktop/src/lib/tabs/tabPresentation.ts
index d7f4edb1e2..bf76406c79 100644
--- a/apps/desktop/src/lib/tabs/tabPresentation.ts
+++ b/apps/desktop/src/lib/tabs/tabPresentation.ts
@@ -856,7 +856,8 @@ export function appTabActiveIndicator(): string {
}
export function tabColorStyle(tab: QueryTab, active: boolean, isClassic: boolean): CSSProperties | undefined {
- if (!useSettingsStore().editorSettings.colorizeConnectionTabs) {
+ const settings = useSettingsStore().editorSettings;
+ if (!settings.colorizeConnectionTabs || (settings.colorizeConnectionTabsScope === "active" && !active)) {
const activeIndicator = appTabActiveIndicator();
const background = appTabActiveBackground();
if (isClassic) return active ? { "--app-tab-background": background, boxShadow: activeIndicator } : undefined;
diff --git a/apps/desktop/src/stores/__tests__/settingsStore.spec.ts b/apps/desktop/src/stores/__tests__/settingsStore.spec.ts
index 3010bd0152..a463e76016 100644
--- a/apps/desktop/src/stores/__tests__/settingsStore.spec.ts
+++ b/apps/desktop/src/stores/__tests__/settingsStore.spec.ts
@@ -1190,6 +1190,24 @@ describe("normalizeEditorSettings - tabLayout", () => {
});
});
+describe("normalizeEditorSettings - colorizeConnectionTabsScope", () => {
+ it("defaults colorizeConnectionTabsScope to all", () => {
+ expect(normalizeEditorSettings({}).colorizeConnectionTabsScope).toBe("all");
+ });
+
+ it("preserves explicit all and active modes", () => {
+ expect(normalizeEditorSettings({ colorizeConnectionTabsScope: "all" }).colorizeConnectionTabsScope).toBe("all");
+ expect(normalizeEditorSettings({ colorizeConnectionTabsScope: "active" }).colorizeConnectionTabsScope).toBe("active");
+ });
+
+ it("falls back to all for invalid values", () => {
+ expect(normalizeEditorSettings({ colorizeConnectionTabsScope: "invalid" } as any).colorizeConnectionTabsScope).toBe("all");
+ expect(normalizeEditorSettings({ colorizeConnectionTabsScope: undefined } as any).colorizeConnectionTabsScope).toBe("all");
+ expect(normalizeEditorSettings({ colorizeConnectionTabsScope: null } as any).colorizeConnectionTabsScope).toBe("all");
+ expect(normalizeEditorSettings({ colorizeConnectionTabsScope: 123 } as any).colorizeConnectionTabsScope).toBe("all");
+ });
+});
+
describe("normalizeEditorSettings - tabMaxWidth", () => {
it("defaults tabMaxWidth to 0", () => {
expect(normalizeEditorSettings({}).tabMaxWidth).toBe(0);
@@ -1889,8 +1907,10 @@ describe("settingsStore persisted settings initialization", () => {
const firstStore = useSettingsStore();
await firstStore.initEditorSettings();
expect(firstStore.editorSettings.colorizeConnectionTabs).toBe(true);
+ expect(firstStore.editorSettings.colorizeConnectionTabsScope).toBe("all");
await firstStore.updateEditorSettingsAndPersist({
colorizeConnectionTabs: false,
+ colorizeConnectionTabsScope: "active",
tabPlacement: "left",
tabGroupMode: "connection",
tabSortMode: "title-asc",
@@ -1905,6 +1925,7 @@ describe("settingsStore persisted settings initialization", () => {
expect(restartedStore.editorSettings).toMatchObject({
colorizeConnectionTabs: false,
+ colorizeConnectionTabsScope: "active",
tabPlacement: "left",
tabGroupMode: "connection",
tabSortMode: "title-asc",
diff --git a/apps/desktop/src/stores/settingsStore.ts b/apps/desktop/src/stores/settingsStore.ts
index 10507ceb9b..b4fb9dc1a2 100644
--- a/apps/desktop/src/stores/settingsStore.ts
+++ b/apps/desktop/src/stores/settingsStore.ts
@@ -812,6 +812,8 @@ const TAB_LAYOUT_MODES = ["scroll", "wrap"] as const;
export type TabLayoutMode = (typeof TAB_LAYOUT_MODES)[number];
const TAB_PLACEMENTS = ["top", "bottom", "left", "right"] as const;
export type TabPlacement = (typeof TAB_PLACEMENTS)[number];
+const CONNECTION_TAB_COLOR_SCOPES = ["all", "active"] as const;
+export type ConnectionTabColorScope = (typeof CONNECTION_TAB_COLOR_SCOPES)[number];
const TAB_GROUP_MODES = ["none", "database-type", "database", "connection", "sidebar"] as const;
export type TabGroupMode = (typeof TAB_GROUP_MODES)[number];
export interface TabGroupCustomization {
@@ -1026,6 +1028,7 @@ export interface EditorSettings {
tabLayout: TabLayoutMode;
tabPlacement: TabPlacement;
colorizeConnectionTabs: boolean;
+ colorizeConnectionTabsScope: ConnectionTabColorScope;
tabGroupMode: TabGroupMode;
tabGroupCustomizations: Record<string, TabGroupCustomization>;
tabSortMode: TabSortMode;
@@ -1409,6 +1412,7 @@ export const DEFAULT_EDITOR_SETTINGS: EditorSettings = {
tabLayout: "scroll",
tabPlacement: "top",
colorizeConnectionTabs: true,
+ colorizeConnectionTabsScope: "all",
tabGroupMode: "none",
tabGroupCustomizations: {},
tabSortMode: "manual",
@@ -1642,6 +1646,10 @@ function normalizeTabPlacement(value: unknown): TabPlacement {
return TAB_PLACEMENTS.includes(value as TabPlacement) ? (value as TabPlacement) : DEFAULT_EDITOR_SETTINGS.tabPlacement;
}
+function normalizeConnectionTabColorScope(value: unknown): ConnectionTabColorScope {
+ return CONNECTION_TAB_COLOR_SCOPES.includes(value as ConnectionTabColorScope) ? (value as ConnectionTabColorScope) : DEFAULT_EDITOR_SETTINGS.colorizeConnectionTabsScope;
+}
+
function normalizeTabGroupMode(value: unknown): TabGroupMode {
return TAB_GROUP_MODES.includes(value as TabGroupMode) ? (value as TabGroupMode) : DEFAULT_EDITOR_SETTINGS.tabGroupMode;
}
@@ -2082,6 +2090,7 @@ export function normalizeEditorSettings(settings: Partial<EditorSettings>, exist
tabLayout: normalizeTabLayout(settings.tabLayout),
tabPlacement: normalizeTabPlacement(settings.tabPlacement),
colorizeConnectionTabs: typeof settings.colorizeConnectionTabs === "boolean" ? settings.colorizeConnectionTabs : DEFAULT_EDITOR_SETTINGS.colorizeConnectionTabs,
+ colorizeConnectionTabsScope: normalizeConnectionTabColorScope(settings.colorizeConnectionTabsScope),
tabGroupMode: normalizeTabGroupMode(settings.tabGroupMode),
tabGroupCustomizations: normalizeTabGroupCustomizations(settings.tabGroupCustomizations),
tabSortMode: normalizeTabSortMode(settings.tabSortMode),
@@ -3006,6 +3015,7 @@ export const useSettingsStore = defineStore("settings", () => {
if (partial.tabLayout !== undefined) editorSettings.value.tabLayout = normalizeTabLayout(partial.tabLayout);
if (partial.tabPlacement !== undefined) editorSettings.value.tabPlacement = normalizeTabPlacement(partial.tabPlacement);
if (partial.colorizeConnectionTabs !== undefined) editorSettings.value.colorizeConnectionTabs = partial.colorizeConnectionTabs === true;
+ if (partial.colorizeConnectionTabsScope !== undefined) editorSettings.value.colorizeConnectionTabsScope = normalizeConnectionTabColorScope(partial.colorizeConnectionTabsScope);
if (partial.tabGroupMode !== undefined) editorSettings.value.tabGroupMode = normalizeTabGroupMode(partial.tabGroupMode);
if (partial.tabGroupCustomizations !== undefined) editorSettings.value.tabGroupCustomizations = normalizeTabGroupCustomizations(partial.tabGroupCustomizations);
if (partial.tabSortMode !== undefined) editorSettings.value.tabSortMode = normalizeTabSortMode(partial.tabSortMode);