Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
feat: configurable hover and pinned states for sidebar (#720)
Kyle Mendell72b2c4f5ee66
diff --git a/.vscode/settings.json b/.vscode/settings.jsonindex a4cf87ef4..67d46a53d 100644--- a/.vscode/settings.json+++ b/.vscode/settings.json@@ -10,5 +10,6 @@"go.buildTags": "playwright","prettier.documentSelectors": ["**/*.svelte"],"tasks.statusbar.default.hide": true,- "tasks.statusbar.limit": 8+ "tasks.statusbar.limit": 8,+ "findUnusedExports.detectCircularImports": true}diff --git a/frontend/messages/en.json b/frontend/messages/en.jsonindex 92b315095..9e0a01bec 100644--- a/frontend/messages/en.json+++ b/frontend/messages/en.json@@ -910,6 +910,12 @@"navigation_tap_to_hide_label": "Tap to Hide","navigation_tap_to_hide_description": "Allow users to tap outside the navigation area to quickly show or hide the navigation bar","navigation_settings_saved": "Navigation settings saved successfully",+ "navigation_desktop_sidebar_title": "Desktop Sidebar",+ "navigation_desktop_sidebar_description": "Configure desktop sidebar behavior and appearance",+ "navigation_sidebar_hover_expansion_label": "Enable Hover Expansion",+ "navigation_sidebar_hover_expansion_description": "When enabled, hovering over the collapsed sidebar will temporarily expand it to show full labels. When disabled, tooltips will appear instead for a cleaner, fixed-width navigation.",+ "navigation_sidebar_hover_expansion_enabled": "Enabled",+ "navigation_sidebar_hover_expansion_disabled": "Disabled","server_default": "Server Default","applies_to_all_users": "Applies to all users","this_device": "This Device",diff --git a/frontend/src/lib/components/sidebar/sidebar-env-switcher.svelte b/frontend/src/lib/components/sidebar/sidebar-env-switcher.svelteindex b88970ae7..44996b326 100644--- a/frontend/src/lib/components/sidebar/sidebar-env-switcher.svelte+++ b/frontend/src/lib/components/sidebar/sidebar-env-switcher.svelte@@ -58,12 +58,6 @@</script><Sidebar.Menu>- <Label- class={cn(- 'text-sidebar-foreground/60 mb-2 px-2 text-xs font-medium transition-opacity duration-200',- sidebar.open || sidebar.isHovered ? 'opacity-100' : 'opacity-0'- )}>{m.sidebar_environment_label()}</Label- ><Sidebar.MenuItem><DropdownMenu.Root bind:open={dropdownOpen}><DropdownMenu.Trigger>diff --git a/frontend/src/lib/components/sidebar/sidebar-logo.svelte b/frontend/src/lib/components/sidebar/sidebar-logo.svelteindex 73378fbc0..3d277e566 100644--- a/frontend/src/lib/components/sidebar/sidebar-logo.svelte+++ b/frontend/src/lib/components/sidebar/sidebar-logo.svelte@@ -14,14 +14,11 @@<divclass={cn('border-border/30 flex border-b transition-all duration-300',- isCollapsed ? 'h-16 items-center justify-center px-2' : 'h-14 items-center px-4'+ isCollapsed ? 'h-16 items-center justify-center px-2' : 'h-14 items-center justify-center px-4')}><div- class={cn(- 'relative flex shrink-0 items-center transition-all duration-300',- isCollapsed ? 'justify-center' : '-translate-y-1 flex-col items-start justify-center'- )}+ class={cn('relative flex shrink-0 items-center justify-center transition-all duration-300', isCollapsed ? '' : 'flex-col')}><imgsrc={logoUrl}@@ -30,10 +27,5 @@width={isCollapsed ? '24' : '160'}height={isCollapsed ? '24' : '72'}/>- {#if !isCollapsed}- <span class="text-muted-foreground/80 absolute bottom-[-0.35rem] left-1/2 translate-x-[20%] text-xs font-medium">- {m.sidebar_version({ version: versionInformation?.currentVersion ?? m.common_unknown() })}- </span>- {/if}</div></div>diff --git a/frontend/src/lib/components/sidebar/sidebar.svelte b/frontend/src/lib/components/sidebar/sidebar.svelteindex d9dc614ba..010a07cfe 100644--- a/frontend/src/lib/components/sidebar/sidebar.svelte+++ b/frontend/src/lib/components/sidebar/sidebar.svelte@@ -40,23 +40,34 @@});const effectiveUser = $derived(user ?? storeUser);- const isCollapsed = $derived(sidebar.state === 'collapsed' && !sidebar.isHovered);+ const isCollapsed = $derived(sidebar.state === 'collapsed' && !(sidebar.hoverExpansionEnabled && sidebar.isHovered));const isAdmin = $derived(!!effectiveUser?.roles?.includes('admin'));</script><Sidebar.Root {collapsible} {variant} {...restProps}>- <Sidebar.Header>+ <Sidebar.Header class={isCollapsed ? 'gap-0 p-1 pb-2' : ''}>+ {#if isCollapsed}+ <div class="flex justify-center">+ <SidebarPinButton />+ </div>+ {/if}<div class="relative"><SidebarLogo {isCollapsed} {versionInformation} />- {#if !isCollapsed || sidebar.isHovered}- <div class="absolute top-0 right-0 -mt-1 -mr-1">+ {#if !isCollapsed}+ <div class="absolute right-0 top-0 -mr-1 -mt-1"><SidebarPinButton /></div>{/if}</div>- <SidebarEnvSwitcher {isAdmin} />+ {#if isCollapsed}+ <div class="flex justify-center px-1">+ <SidebarEnvSwitcher {isAdmin} />+ </div>+ {:else}+ <SidebarEnvSwitcher {isAdmin} />+ {/if}</Sidebar.Header>- <Sidebar.Content>+ <Sidebar.Content class={!isCollapsed ? '-mt-2' : ''}><SidebarItemGroup label={m.sidebar_management()} items={navigationItems.managementItems} /><SidebarItemGroup label={m.sidebar_customization()} items={navigationItems.customizationItems} />{#if isAdmin}@@ -91,5 +102,10 @@</div>{/if}{/if}+ <div class={`flex items-center justify-center ${isCollapsed ? 'px-1' : 'px-4'}`}>+ <span class="text-muted-foreground/60 text-xs font-medium">+ {m.sidebar_version({ version: versionInformation?.currentVersion ?? m.common_unknown() })}+ </span>+ </div></Sidebar.Footer></Sidebar.Root>diff --git a/frontend/src/lib/components/ui/sidebar/constants.ts b/frontend/src/lib/components/ui/sidebar/constants.tsindex 2d3bbfbc0..8911acb70 100644--- a/frontend/src/lib/components/ui/sidebar/constants.ts+++ b/frontend/src/lib/components/ui/sidebar/constants.ts@@ -1,6 +1,6 @@export const SIDEBAR_COOKIE_NAME = 'sidebar:state';export const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7;-export const SIDEBAR_WIDTH = '16rem';+export const SIDEBAR_WIDTH = '17rem';export const SIDEBAR_WIDTH_MOBILE = '18rem';export const SIDEBAR_WIDTH_ICON = '3rem';export const SIDEBAR_KEYBOARD_SHORTCUT = 'b';diff --git a/frontend/src/lib/components/ui/sidebar/context.svelte.ts b/frontend/src/lib/components/ui/sidebar/context.svelte.tsindex 829b252e3..d17821a0c 100644--- a/frontend/src/lib/components/ui/sidebar/context.svelte.ts+++ b/frontend/src/lib/components/ui/sidebar/context.svelte.ts@@ -27,6 +27,7 @@ class SidebarState {setOpen: SidebarStateProps['setOpen'];#isTablet: IsTablet;#isPinnedState = new PersistedState('sidebar-pinned', true);+ #hoverExpansionEnabled = new PersistedState('sidebar-hover-expansion', false);#isHovered = $state(false);#hoverTimeout: ReturnType<typeof setTimeout> | null = null;state = $derived.by(() => (this.open ? 'expanded' : 'collapsed'));@@ -67,14 +68,26 @@ class SidebarState {return this.#isPinnedState.current;}+ // Getter for hover expansion preference+ get hoverExpansionEnabled() {+ return this.#hoverExpansionEnabled.current;+ }++ // Setter for hover expansion preference+ setHoverExpansion = (enabled: boolean) => {+ this.#hoverExpansionEnabled.current = enabled;+ };+// Derived state that shows if sidebar should be visually expanded (either open or hovered)get isExpanded() {- // In desktop mode: expanded if open OR (collapsed AND hovered)+ // In desktop mode: expanded if open OR (collapsed AND hovered AND hover expansion is enabled)// In tablet mode: expanded only when hovered (since it's always collapsed)if (this.#isTablet.current) {return this.#isHovered;}- return this.open || (!this.open && this.#isHovered);+ // Only consider hover state for expansion if hover expansion is enabled+ const shouldExpandOnHover = !this.open && this.#isHovered && this.#hoverExpansionEnabled.current;+ return this.open || shouldExpandOnHover;}// Set hover state with optional delay for clearingdiff --git a/frontend/src/lib/components/ui/sidebar/sidebar-content.svelte b/frontend/src/lib/components/ui/sidebar/sidebar-content.svelteindex e2373883b..090a41442 100644--- a/frontend/src/lib/components/ui/sidebar/sidebar-content.svelte+++ b/frontend/src/lib/components/ui/sidebar/sidebar-content.svelte@@ -1,8 +1,11 @@<script lang="ts">import type { HTMLAttributes } from 'svelte/elements';import { cn, type WithElementRef } from '$lib/utils.js';+ import { useSidebar } from './context.svelte.js';let { ref = $bindable(null), class: className, children, ...restProps }: WithElementRef<HTMLAttributes<HTMLElement>> = $props();++ const sidebar = useSidebar();</script><div@@ -10,7 +13,10 @@data-slot="sidebar-content"data-sidebar="content"class={cn(- 'flex min-h-0 flex-1 flex-col gap-2 overflow-x-hidden overflow-y-auto group-data-[collapsible=icon]:overflow-hidden group-data-[collapsible=icon]:group-data-[hovered=true]:overflow-x-hidden group-data-[collapsible=icon]:group-data-[hovered=true]:overflow-y-auto',+ 'flex min-h-0 flex-1 flex-col gap-2 overflow-y-auto overflow-x-hidden',+ sidebar.hoverExpansionEnabled+ ? 'group-data-[collapsible=icon]:overflow-hidden group-data-[collapsible=icon]:group-data-[hovered=true]:overflow-y-auto group-data-[collapsible=icon]:group-data-[hovered=true]:overflow-x-hidden'+ : 'group-data-[collapsible=icon]:overflow-hidden',className)}{...restProps}diff --git a/frontend/src/lib/components/ui/sidebar/sidebar-group-action.svelte b/frontend/src/lib/components/ui/sidebar/sidebar-group-action.svelteindex 542a0fb1d..929993ee1 100644--- a/frontend/src/lib/components/ui/sidebar/sidebar-group-action.svelte+++ b/frontend/src/lib/components/ui/sidebar/sidebar-group-action.svelte@@ -18,7 +18,7 @@'text-sidebar-foreground ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground outline-hidden absolute right-3 top-3.5 flex aspect-square w-5 items-center justify-center rounded-md p-0 transition-transform focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0',// Increases the hit area of the button on mobile.'after:absolute after:-inset-2 md:after:hidden',- 'group-data-[collapsible=icon]:hidden group-data-[collapsible=icon]:group-data-[hovered=true]:flex',+ 'group-data-[collapsible=icon]:hidden',className),'data-slot': 'sidebar-group-action',diff --git a/frontend/src/lib/components/ui/sidebar/sidebar-group-label.svelte b/frontend/src/lib/components/ui/sidebar/sidebar-group-label.svelteindex c50b0fa67..786d94d11 100644--- a/frontend/src/lib/components/ui/sidebar/sidebar-group-label.svelte+++ b/frontend/src/lib/components/ui/sidebar/sidebar-group-label.svelte@@ -2,6 +2,7 @@import { cn, type WithElementRef } from '$lib/utils.js';import type { Snippet } from 'svelte';import type { HTMLAttributes } from 'svelte/elements';+ import { useSidebar } from './context.svelte.js';let {ref = $bindable(null),@@ -13,10 +14,14 @@child?: Snippet<[{ props: Record<string, unknown> }]>;} = $props();+ const sidebar = useSidebar();+const mergedProps = $derived({class: cn('text-sidebar-foreground/70 ring-sidebar-ring outline-hidden flex h-8 shrink-0 items-center rounded-md px-2 text-xs font-medium transition-[margin,opacity] duration-200 ease-linear focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0',- 'group-data-[collapsible=icon]:-mt-8 group-data-[collapsible=icon]:opacity-0 group-data-[collapsible=icon]:group-data-[hovered=true]:mt-0 group-data-[collapsible=icon]:group-data-[hovered=true]:opacity-100',+ sidebar.hoverExpansionEnabled+ ? 'group-data-[collapsible=icon]:-mt-8 group-data-[collapsible=icon]:opacity-0 group-data-[collapsible=icon]:group-data-[hovered=true]:mt-0 group-data-[collapsible=icon]:group-data-[hovered=true]:opacity-100'+ : 'group-data-[collapsible=icon]:hidden',className),'data-slot': 'sidebar-group-label',diff --git a/frontend/src/lib/components/ui/sidebar/sidebar-menu-action.svelte b/frontend/src/lib/components/ui/sidebar/sidebar-menu-action.svelteindex f68c819ab..3f178c8f5 100644--- a/frontend/src/lib/components/ui/sidebar/sidebar-menu-action.svelte+++ b/frontend/src/lib/components/ui/sidebar/sidebar-menu-action.svelte@@ -23,7 +23,7 @@'peer-data-[size=sm]/menu-button:top-1','peer-data-[size=default]/menu-button:top-1.5','peer-data-[size=lg]/menu-button:top-2.5',- 'group-data-[collapsible=icon]:hidden group-data-[collapsible=icon]:group-data-[hovered=true]:flex',+ 'group-data-[collapsible=icon]:hidden',showOnHover &&'peer-data-[active=true]/menu-button:text-sidebar-accent-foreground group-focus-within/menu-item:opacity-100 group-hover/menu-item:opacity-100 data-[state=open]:opacity-100 md:opacity-0',classNamediff --git a/frontend/src/lib/components/ui/sidebar/sidebar-menu-badge.svelte b/frontend/src/lib/components/ui/sidebar/sidebar-menu-badge.svelteindex ad032035f..d52ab115c 100644--- a/frontend/src/lib/components/ui/sidebar/sidebar-menu-badge.svelte+++ b/frontend/src/lib/components/ui/sidebar/sidebar-menu-badge.svelte@@ -10,12 +10,12 @@data-slot="sidebar-menu-badge"data-sidebar="menu-badge"class={cn(- 'text-sidebar-foreground pointer-events-none absolute right-1 flex h-5 min-w-5 items-center justify-center rounded-md px-1 text-xs font-medium tabular-nums select-none',+ 'text-sidebar-foreground pointer-events-none absolute right-1 flex h-5 min-w-5 select-none items-center justify-center rounded-md px-1 text-xs font-medium tabular-nums','peer-hover/menu-button:text-sidebar-accent-foreground peer-data-[active=true]/menu-button:text-sidebar-accent-foreground','peer-data-[size=sm]/menu-button:top-1','peer-data-[size=default]/menu-button:top-1.5','peer-data-[size=lg]/menu-button:top-2.5',- 'group-data-[collapsible=icon]:hidden group-data-[collapsible=icon]:group-data-[hovered=true]:flex',+ 'group-data-[collapsible=icon]:hidden',className)}{...restProps}diff --git a/frontend/src/lib/components/ui/sidebar/sidebar-menu-button.svelte b/frontend/src/lib/components/ui/sidebar/sidebar-menu-button.svelteindex 8dde125fc..4156961ec 100644--- a/frontend/src/lib/components/ui/sidebar/sidebar-menu-button.svelte+++ b/frontend/src/lib/components/ui/sidebar/sidebar-menu-button.svelte@@ -2,7 +2,7 @@import { tv, type VariantProps } from 'tailwind-variants';export const sidebarMenuButtonVariants = tv({- base: 'peer/menu-button outline-hidden ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground active:bg-sidebar-accent active:text-sidebar-accent-foreground group-has-data-[sidebar=menu-action]/menu-item:pr-8 data-[active=true]:bg-sidebar-accent data-[active=true]:text-sidebar-accent-foreground data-[state=open]:hover:bg-sidebar-accent data-[state=open]:hover:text-sidebar-accent-foreground group-data-[collapsible=icon]:size-8! group-data-[collapsible=icon]:p-2! group-data-[collapsible=icon]:group-data-[hovered=true]:w-full! flex w-full items-center gap-2 overflow-hidden rounded-md p-2 text-left text-sm transition-[width,height,padding] focus-visible:ring-2 disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:font-medium [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0',+ base: 'peer/menu-button outline-hidden ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground active:bg-sidebar-accent active:text-sidebar-accent-foreground group-has-data-[sidebar=menu-action]/menu-item:pr-8 data-[active=true]:bg-sidebar-accent data-[active=true]:text-sidebar-accent-foreground data-[state=open]:hover:bg-sidebar-accent data-[state=open]:hover:text-sidebar-accent-foreground group-data-[collapsible=icon]:size-8! group-data-[collapsible=icon]:p-2! flex w-full items-center gap-2 overflow-hidden rounded-md p-2 text-left text-sm transition-[width,height,padding] focus-visible:ring-2 disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:font-medium [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0',variants: {variant: {default: 'hover:bg-sidebar-accent hover:text-sidebar-accent-foreground',@@ -12,7 +12,7 @@size: {default: 'h-8 text-sm',sm: 'h-7 text-xs',- lg: 'group-data-[collapsible=icon]:p-0! h-12 text-sm group-data-[collapsible=icon]:group-data-[hovered=true]:h-12! group-data-[collapsible=icon]:group-data-[hovered=true]:p-2!'+ lg: 'group-data-[collapsible=icon]:p-0! h-12 text-sm'}},defaultVariants: {@@ -56,7 +56,15 @@const sidebar = useSidebar();const buttonProps = $derived({- class: cn(sidebarMenuButtonVariants({ variant, size }), className),+ class: cn(+ sidebarMenuButtonVariants({ variant, size }),+ sidebar.hoverExpansionEnabled && [+ 'group-data-[collapsible=icon]:group-data-[hovered=true]:w-full!',+ size === 'lg' &&+ 'group-data-[collapsible=icon]:group-data-[hovered=true]:h-12! group-data-[collapsible=icon]:group-data-[hovered=true]:p-2!'+ ],+ className+ ),'data-slot': 'sidebar-menu-button','data-sidebar': 'menu-button','data-size': size,@@ -88,7 +96,7 @@<Tooltip.Contentside="right"align="center"- hidden={sidebar.state !== 'collapsed' || sidebar.isHovered}+ hidden={sidebar.state !== 'collapsed' || (sidebar.hoverExpansionEnabled && sidebar.isHovered)}{...tooltipContentProps}>{#if typeof tooltipContent === 'string'}diff --git a/frontend/src/lib/components/ui/sidebar/sidebar-menu-sub-button.svelte b/frontend/src/lib/components/ui/sidebar/sidebar-menu-sub-button.svelteindex 83a6d3c55..95191c2a3 100644--- a/frontend/src/lib/components/ui/sidebar/sidebar-menu-sub-button.svelte+++ b/frontend/src/lib/components/ui/sidebar/sidebar-menu-sub-button.svelte@@ -23,7 +23,7 @@'data-[active=true]:bg-sidebar-accent data-[active=true]:text-sidebar-accent-foreground',size === 'sm' && 'text-xs',size === 'md' && 'text-sm',- 'group-data-[collapsible=icon]:hidden group-data-[collapsible=icon]:group-data-[hovered=true]:flex',+ 'group-data-[collapsible=icon]:hidden',className),'data-slot': 'sidebar-menu-sub-button',diff --git a/frontend/src/lib/components/ui/sidebar/sidebar-menu-sub.svelte b/frontend/src/lib/components/ui/sidebar/sidebar-menu-sub.svelteindex c8858d4da..620ea999c 100644--- a/frontend/src/lib/components/ui/sidebar/sidebar-menu-sub.svelte+++ b/frontend/src/lib/components/ui/sidebar/sidebar-menu-sub.svelte@@ -16,7 +16,7 @@data-sidebar="menu-sub"class={cn('border-sidebar-border mx-3.5 flex min-w-0 translate-x-px flex-col gap-1 border-l px-2.5 py-0.5',- 'group-data-[collapsible=icon]:hidden group-data-[collapsible=icon]:group-data-[hovered=true]:flex',+ 'group-data-[collapsible=icon]:hidden',className)}{...restProps}diff --git a/frontend/src/lib/components/ui/sidebar/sidebar-rail.svelte b/frontend/src/lib/components/ui/sidebar/sidebar-rail.svelteindex 1d739cb1e..199d5763d 100644--- a/frontend/src/lib/components/ui/sidebar/sidebar-rail.svelte+++ b/frontend/src/lib/components/ui/sidebar/sidebar-rail.svelte@@ -21,28 +21,18 @@tabIndex={sidebar.isTablet ? -1 : -1}onclick={(e) => {if (!sidebar.isTablet) {- // If we're in overlay mode (collapsed and hovered), clicking should expand the sidebar- if (sidebar.state === 'collapsed' && sidebar.isHovered) {- sidebar.setOpen(true);- sidebar.setHovered(false); // Clear hover state when pinning- } else {- // Otherwise, toggle normally- sidebar.toggle();- }+ sidebar.toggle();}}}title={sidebar.isTablet ? '' : 'Toggle Sidebar'}class={cn(- 'absolute inset-y-0 z-20 hidden w-4 -translate-x-1/2 transition-all ease-linear group-data-[side=left]:-right-4 group-data-[side=right]:left-0 after:absolute after:inset-y-0 after:left-1/2 after:w-[2px] sm:flex',+ 'absolute inset-y-0 z-20 hidden w-4 -translate-x-1/2 transition-all ease-linear after:absolute after:inset-y-0 after:left-1/2 after:w-[2px] group-data-[side=left]:-right-4 group-data-[side=right]:left-0 sm:flex',// Only show hover and cursor effects when not in tablet mode!sidebar.isTablet && ['hover:after:bg-sidebar-border','in-data-[side=left]:cursor-w-resize in-data-[side=right]:cursor-e-resize','[[data-side=left][data-state=collapsed]_&]:cursor-e-resize [[data-side=right][data-state=collapsed]_&]:cursor-w-resize',- 'hover:group-data-[collapsible=offcanvas]:bg-sidebar group-data-[collapsible=offcanvas]:translate-x-0 group-data-[collapsible=offcanvas]:after:left-full',- // Show rail more prominently when sidebar is hovered in collapsed state- 'group-data-[collapsible=icon]:group-data-[hovered=true]:after:bg-sidebar-border',- 'group-data-[collapsible=icon]:group-data-[hovered=true]:opacity-100'+ 'hover:group-data-[collapsible=offcanvas]:bg-sidebar group-data-[collapsible=offcanvas]:translate-x-0 group-data-[collapsible=offcanvas]:after:left-full'],'[[data-side=left][data-collapsible=offcanvas]_&]:-right-2','[[data-side=right][data-collapsible=offcanvas]_&]:-left-2',diff --git a/frontend/src/lib/components/ui/sidebar/sidebar.svelte b/frontend/src/lib/components/ui/sidebar/sidebar.svelteindex 793787a41..c2082f134 100644--- a/frontend/src/lib/components/ui/sidebar/sidebar.svelte+++ b/frontend/src/lib/components/ui/sidebar/sidebar.svelte@@ -24,7 +24,7 @@{#if collapsible === 'none'}<div- class={cn('bg-sidebar text-sidebar-foreground flex h-full w-(--sidebar-width) flex-col', className)}+ class={cn('bg-sidebar text-sidebar-foreground w-(--sidebar-width) flex h-full flex-col', className)}bind:this={ref}{...restProps}>@@ -45,7 +45,7 @@<divdata-slot="sidebar-gap"class={cn(- 'relative w-(--sidebar-width) bg-transparent transition-[width] duration-200 ease-linear',+ 'w-(--sidebar-width) relative bg-transparent transition-[width] duration-200 ease-linear','group-data-[collapsible=offcanvas]:w-0','group-data-[side=right]:rotate-180',variant === 'floating' || variant === 'inset'@@ -56,7 +56,7 @@<divdata-slot="sidebar-container"class={cn(- 'fixed inset-y-0 z-10 hidden h-svh w-(--sidebar-width) overflow-x-hidden transition-[left,right,width] duration-200 ease-linear md:flex',+ 'w-(--sidebar-width) fixed inset-y-0 z-10 hidden h-svh overflow-x-hidden transition-[left,right,width] duration-200 ease-linear md:flex',side === 'left'? 'left-0 group-data-[collapsible=offcanvas]:left-[calc(var(--sidebar-width)*-1)]': 'right-0 group-data-[collapsible=offcanvas]:right-[calc(var(--sidebar-width)*-1)]',@@ -64,12 +64,15 @@variant === 'floating' || variant === 'inset'? 'p-2 group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+(--spacing(4))+2px)]': 'group-data-[collapsible=icon]:w-(--sidebar-width-icon) group-data-[side=left]:border-r group-data-[side=right]:border-l',- // Hover overlay effect - expand to full width when collapsed and hovered- 'group-data-[collapsible=icon]:group-data-[hovered=true]:w-(--sidebar-width)',- 'group-data-[collapsible=icon]:group-data-[hovered=true]:shadow-lg',+ // Conditionally apply hover expansion if enabled+ sidebar.hoverExpansionEnabled && [+ 'group-data-[collapsible=icon]:group-data-[hovered=true]:w-(--sidebar-width)',+ 'group-data-[collapsible=icon]:group-data-[hovered=true]:shadow-lg'+ ],className)}onmouseenter={() => {+ // Only track hover state if needed (expansion enabled or for dropdown management)if (sidebar.state === 'collapsed') {sidebar.setHovered(true);}diff --git a/frontend/src/routes/settings/navigation/+page.svelte b/frontend/src/routes/settings/navigation/+page.svelteindex 36a806005..2070cea1f 100644--- a/frontend/src/routes/settings/navigation/+page.svelte+++ b/frontend/src/routes/settings/navigation/+page.svelte@@ -9,6 +9,7 @@import MousePointerClickIcon from '@lucide/svelte/icons/mouse-pointer-click';import ScrollTextIcon from '@lucide/svelte/icons/scroll-text';import NavigationIcon from '@lucide/svelte/icons/navigation';+ import SidebarIcon from '@lucide/svelte/icons/sidebar';import NavigationSettingControl from '$lib/components/navigation-setting-control.svelte';import NavigationModeSettingControl from '$lib/components/navigation-mode-setting-control.svelte';import settingsStore from '$lib/stores/config-store';@@ -16,6 +17,8 @@import { navigationSettingsOverridesStore, resetNavigationVisibility } from '$lib/utils/navigation.utils';import { settingsService } from '$lib/services/settings-service';import { SettingsPageLayout } from '$lib/layouts';+ import { Switch } from '$lib/components/ui/switch/index.js';+ import { useSidebar } from '$lib/components/ui/sidebar/context.svelte.js';let { data } = $props();let currentSettings = $state(data.settings!);@@ -34,6 +37,9 @@// Track local override state using the shared storelet persistedState = $state(navigationSettingsOverridesStore.current);+ const sidebar = useSidebar();+ let sidebarHoverExpansion = $state(sidebar.hoverExpansionEnabled);+let { inputs: formInputs, ...form } = $derived(createForm<typeof formSchema>(formSchema, currentSettings));const formHasChanges = $derived.by(@@ -146,6 +152,47 @@>{#snippet mainContent()}<div class="space-y-4 sm:space-y-6">+ <Card.Root>+ <Card.Header icon={SidebarIcon}>+ <div class="flex flex-col space-y-1.5">+ <Card.Title>{m.navigation_desktop_sidebar_title()}</Card.Title>+ <Card.Description>{m.navigation_desktop_sidebar_description()}</Card.Description>+ </div>+ </Card.Header>+ <Card.Content class="px-3 py-3 sm:px-6 sm:py-4">+ <div class="flex items-start gap-3 rounded-lg border p-3 sm:p-4">+ <div+ class="bg-primary/10 text-primary ring-primary/20 flex size-7 flex-shrink-0 items-center justify-center rounded-lg ring-1 sm:size-8"+ >+ <SidebarIcon class="size-3 sm:size-4" />+ </div>+ <div class="flex flex-1 flex-col gap-3">+ <div>+ <h4 class="mb-1 text-sm font-medium leading-tight">{m.navigation_sidebar_hover_expansion_label()}</h4>+ <p class="text-muted-foreground text-xs leading-relaxed">+ {m.navigation_sidebar_hover_expansion_description()}+ </p>+ </div>+ <div class="flex items-center gap-2">+ <Switch+ id="sidebarHoverExpansion"+ checked={sidebarHoverExpansion}+ onCheckedChange={(checked) => {+ sidebarHoverExpansion = checked;+ sidebar.setHoverExpansion(checked);+ }}+ />+ <label for="sidebarHoverExpansion" class="text-xs font-medium">+ {sidebarHoverExpansion+ ? m.navigation_sidebar_hover_expansion_enabled()+ : m.navigation_sidebar_hover_expansion_disabled()}+ </label>+ </div>+ </div>+ </div>+ </Card.Content>+ </Card.Root>+<Card.Root><Card.Header icon={NavigationIcon}><div class="flex flex-col space-y-1.5">