feat(toolbar): move sidebar expand button to toolbar
This commit is contained in:
3 files changed
+23
-8
No files matched your search
@@ -1,7 +1,7 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, computed, watch, onMounted, onUnmounted, nextTick, defineAsyncComponent, provide } from "vue";
|
import { ref, computed, watch, onMounted, onUnmounted, nextTick, defineAsyncComponent, provide } from "vue";
|
||||||
import { useI18n } from "vue-i18n";
|
import { useI18n } from "vue-i18n";
|
||||||
import { ChevronsRight, FileText } from "@lucide/vue";
|
import { FileText } from "@lucide/vue";
|
||||||
import { TooltipProvider } from "@/components/ui/tooltip";
|
import { TooltipProvider } from "@/components/ui/tooltip";
|
||||||
import AppToolbar from "@/components/layout/AppToolbar.vue";
|
import AppToolbar from "@/components/layout/AppToolbar.vue";
|
||||||
import AppTabBar from "@/components/layout/AppTabBar.vue";
|
import AppTabBar from "@/components/layout/AppTabBar.vue";
|
||||||
@@ -3425,6 +3425,7 @@ onUnmounted(() => {
|
|||||||
v-if="!isDetachedWindowContext"
|
v-if="!isDetachedWindowContext"
|
||||||
:is-dark="isDark"
|
:is-dark="isDark"
|
||||||
:theme-mode="themeMode"
|
:theme-mode="themeMode"
|
||||||
|
:show-sidebar-expand="!sidebarOpen && !isZenMode"
|
||||||
:show-ai-panel="showAiPanel"
|
:show-ai-panel="showAiPanel"
|
||||||
:active-ai-run-count="activeAiRunCount"
|
:active-ai-run-count="activeAiRunCount"
|
||||||
:awaiting-ai-run-count="awaitingAiRunCount"
|
:awaiting-ai-run-count="awaitingAiRunCount"
|
||||||
@@ -3445,6 +3446,7 @@ onUnmounted(() => {
|
|||||||
:has-connections="connectionStore.connections.length > 0"
|
:has-connections="connectionStore.connections.length > 0"
|
||||||
:has-sql-file-connections="hasSqlFileConnections"
|
:has-sql-file-connections="hasSqlFileConnections"
|
||||||
@new-connection="showConnectionDialog = true"
|
@new-connection="showConnectionDialog = true"
|
||||||
|
@expand-sidebar="setSidebarOpen(true)"
|
||||||
@new-query="newQuery"
|
@new-query="newQuery"
|
||||||
@set-theme-mode="setThemeMode"
|
@set-theme-mode="setThemeMode"
|
||||||
@toggle-ai="toggleRightSidebarPanel('ai')"
|
@toggle-ai="toggleRightSidebarPanel('ai')"
|
||||||
@@ -3475,11 +3477,6 @@ onUnmounted(() => {
|
|||||||
@open-settings="(initialTab) => openSettings(initialTab ?? 'appearance')"
|
@open-settings="(initialTab) => openSettings(initialTab ?? 'appearance')"
|
||||||
@add-to-ai="addToAi"
|
@add-to-ai="addToAi"
|
||||||
/>
|
/>
|
||||||
<div v-if="!isDetachedWindowContext" v-show="!sidebarOpen && !isZenMode" class="flex h-full w-8 shrink-0 items-start justify-center border-r bg-background/80 pt-2" :class="isClassicLayout ? '' : 'rounded-md border border-border/80'">
|
|
||||||
<Button variant="ghost" size="icon" class="h-7 w-7" :title="t('sidebar.expand')" :aria-label="t('sidebar.expand')" @click="setSidebarOpen(true)">
|
|
||||||
<ChevronsRight class="h-4 w-4" />
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-show="!isAiPanelMaximized || isZenMode" :class="isDetachedWindowContext ? 'flex-1 min-w-0 overflow-hidden bg-background' : isClassicLayout ? 'flex-1 min-w-0 overflow-hidden' : 'flex-1 min-w-0 overflow-hidden rounded-md border border-border/80 bg-background'">
|
<div v-show="!isAiPanelMaximized || isZenMode" :class="isDetachedWindowContext ? 'flex-1 min-w-0 overflow-hidden bg-background' : isClassicLayout ? 'flex-1 min-w-0 overflow-hidden' : 'flex-1 min-w-0 overflow-hidden rounded-md border border-border/80 bg-background'">
|
||||||
<div class="h-full flex min-h-0 min-w-0 flex-col">
|
<div class="h-full flex min-h-0 min-w-0 flex-col">
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
import { computed, ref, onMounted, onBeforeUnmount, h, nextTick, watch } from "vue";
|
import { computed, ref, onMounted, onBeforeUnmount, h, nextTick, watch } from "vue";
|
||||||
import { useI18n } from "vue-i18n";
|
import { useI18n } from "vue-i18n";
|
||||||
import { invoke } from "@tauri-apps/api/core";
|
import { invoke } from "@tauri-apps/api/core";
|
||||||
import { DatabaseZap, FilePlus2, Moon, Sun, SunMoon, History, Bot, ArrowLeftRight, FileCode, BookMarked, GitCompareArrows, TableProperties, Settings, CloudDownload, Package, FileDown, FolderTree } from "@lucide/vue";
|
import { ChevronsRight, DatabaseZap, FilePlus2, Moon, Sun, SunMoon, History, Bot, ArrowLeftRight, FileCode, BookMarked, GitCompareArrows, TableProperties, Settings, CloudDownload, Package, FileDown, FolderTree } from "@lucide/vue";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
|
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
|
||||||
import LightDropdown from "@/components/ui/LightDropdown.vue";
|
import LightDropdown from "@/components/ui/LightDropdown.vue";
|
||||||
@@ -27,6 +27,7 @@ const GithubIcon = {
|
|||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
isDark: boolean;
|
isDark: boolean;
|
||||||
themeMode: AppThemeMode;
|
themeMode: AppThemeMode;
|
||||||
|
showSidebarExpand?: boolean;
|
||||||
showAiPanel: boolean;
|
showAiPanel: boolean;
|
||||||
activeAiRunCount: number;
|
activeAiRunCount: number;
|
||||||
/** Runs awaiting a write confirmation; the badge turns amber to outrank the
|
/** Runs awaiting a write confirmation; the badge turns amber to outrank the
|
||||||
@@ -51,6 +52,7 @@ const props = defineProps<{
|
|||||||
}>();
|
}>();
|
||||||
|
|
||||||
const emit = defineEmits<{
|
const emit = defineEmits<{
|
||||||
|
"expand-sidebar": [];
|
||||||
"new-connection": [];
|
"new-connection": [];
|
||||||
"new-query": [];
|
"new-query": [];
|
||||||
"set-theme-mode": [mode: AppThemeMode];
|
"set-theme-mode": [mode: AppThemeMode];
|
||||||
@@ -379,6 +381,11 @@ function handleWindowResize() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
watch(collapsibleRightItemDefs, () => scheduleToolbarLayout(), { flush: "post" });
|
watch(collapsibleRightItemDefs, () => scheduleToolbarLayout(), { flush: "post" });
|
||||||
|
watch(
|
||||||
|
() => props.showSidebarExpand,
|
||||||
|
() => scheduleToolbarLayout(),
|
||||||
|
{ flush: "post" },
|
||||||
|
);
|
||||||
watch(
|
watch(
|
||||||
() => settingsStore.editorSettings.uiScale,
|
() => settingsStore.editorSettings.uiScale,
|
||||||
() => {
|
() => {
|
||||||
@@ -534,6 +541,14 @@ const toolbarStyle = computed(() => {
|
|||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div ref="toolbarEl" class="app-toolbar h-10 flex items-center gap-1 px-2 border-b bg-muted/30 shrink-0 overflow-hidden" :style="toolbarStyle" data-tauri-drag-region @dblclick="onToolbarDblClick">
|
<div ref="toolbarEl" class="app-toolbar h-10 flex items-center gap-1 px-2 border-b bg-muted/30 shrink-0 overflow-hidden" :style="toolbarStyle" data-tauri-drag-region @dblclick="onToolbarDblClick">
|
||||||
|
<Tooltip v-if="showSidebarExpand">
|
||||||
|
<TooltipTrigger as-child>
|
||||||
|
<Button variant="ghost" size="icon" class="toolbar-action-button h-8 w-8 shrink-0" :aria-label="t('sidebar.expand')" @click="emit('expand-sidebar')">
|
||||||
|
<ChevronsRight class="h-4 w-4" />
|
||||||
|
</Button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent>{{ t("sidebar.expand") }}</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
<Button variant="ghost" size="sm" :class="toolbarTextButtonClass" @click="emit('new-connection')">
|
<Button variant="ghost" size="sm" :class="toolbarTextButtonClass" @click="emit('new-connection')">
|
||||||
<span class="inline-flex items-center gap-1">
|
<span class="inline-flex items-center gap-1">
|
||||||
<DatabaseZap class="h-3.5 w-3.5" />
|
<DatabaseZap class="h-3.5 w-3.5" />
|
||||||
|
|||||||
@@ -72,7 +72,10 @@ describe("right sidebar panel entry points", () => {
|
|||||||
expect(appSource).toContain("isToggleZenModeShortcut(e, shortcuts) && supportsZenMode(activeTab.value?.mode)");
|
expect(appSource).toContain("isToggleZenModeShortcut(e, shortcuts) && supportsZenMode(activeTab.value?.mode)");
|
||||||
expect(appSource).toContain('@toggle-zen-mode="toggleZenMode"');
|
expect(appSource).toContain('@toggle-zen-mode="toggleZenMode"');
|
||||||
expect(appSource).toContain('v-show="sidebarOpen && !isZenMode"');
|
expect(appSource).toContain('v-show="sidebarOpen && !isZenMode"');
|
||||||
expect(appSource).toContain('v-show="!sidebarOpen && !isZenMode"');
|
expect(appSource).toContain(':show-sidebar-expand="!sidebarOpen && !isZenMode"');
|
||||||
|
expect(toolbarSource).toContain('<Tooltip v-if="showSidebarExpand">');
|
||||||
|
expect(toolbarSource).toContain("@click=\"emit('expand-sidebar')\"");
|
||||||
|
expect(appSource).toContain('@expand-sidebar="setSidebarOpen(true)"');
|
||||||
expect(appSource).toContain('v-show="!isAiPanelMaximized || isZenMode"');
|
expect(appSource).toContain('v-show="!isAiPanelMaximized || isZenMode"');
|
||||||
expect(appSource).toContain('v-show="!isZenMode"');
|
expect(appSource).toContain('v-show="!isZenMode"');
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in new issue
Block a user