Skip to content

Modern Docker Management, Designed for Everyone

feat: screen responsive navigation (#516)

Chase Baucom9b25e9711708
diff --git a/frontend/src/lib/components/sidebar/sidebar-env-switcher.svelte b/frontend/src/lib/components/sidebar/sidebar-env-switcher.svelte
index 0ce96deac..3a1f711e9 100644
--- a/frontend/src/lib/components/sidebar/sidebar-env-switcher.svelte
+++ b/frontend/src/lib/components/sidebar/sidebar-env-switcher.svelte
@@ -12,6 +12,7 @@
import { goto } from '$app/navigation';
import { toast } from 'svelte-sonner';
import { m } from '$lib/paraglide/messages';
+ import { cn } from '$lib/utils';
type Props = {
isAdmin?: boolean;
@@ -21,6 +22,7 @@
const sidebar = useSidebar();
+ let dropdownOpen = $state(false);
let currentSelectedEnvironment = $state<Environment | null>(null);
let availableEnvironments = $state<Environment[]>([]);
@@ -37,6 +39,12 @@
};
});
+ $effect(() => {
+ if (sidebar.state === 'collapsed' && !sidebar.isHovered && dropdownOpen) {
+ dropdownOpen = false;
+ }
+ });
+
async function handleSelect(env: Environment) {
try {
await environmentStore.setEnvironment(env);
@@ -56,11 +64,12 @@
</script>
<Sidebar.Menu>
- {#if sidebar.open}
- <Label class="text-sidebar-foreground/60 mb-2 px-2 text-xs font-medium">{m.sidebar_environment_label()}</Label>
- {/if}
+ <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>
+ <DropdownMenu.Root bind:open={dropdownOpen}>
<DropdownMenu.Trigger>
{#snippet child({ props: childProps })}
<Sidebar.MenuButton
@@ -107,7 +116,19 @@
side={sidebar.isMobile ? 'bottom' : 'right'}
sideOffset={4}
>
- <DropdownMenu.Label class="text-muted-foreground text-xs">{m.sidebar_select_environment()}</DropdownMenu.Label>
+ <div
+ onmouseenter={() => {
+ // Keep sidebar hovered when mouse is over dropdown
+ if (sidebar.state === 'collapsed') {
+ sidebar.setHovered(true);
+ }
+ }}
+ onmouseleave={() => {
+ // Clear hover when leaving dropdown
+ sidebar.setHovered(false, 200);
+ }}
+ >
+ <DropdownMenu.Label class="text-muted-foreground text-xs">{m.sidebar_select_environment()}</DropdownMenu.Label>
{#if availableEnvironments.length === 0}
<DropdownMenu.Item disabled class="gap-2 p-2">
<div class="flex size-6 items-center justify-center rounded-md border">
@@ -145,6 +166,7 @@
<div class="text-muted-foreground font-medium">{m.sidebar_manage_environments()}</div>
</DropdownMenu.Item>
{/if}
+ </div>
</DropdownMenu.Content>
</DropdownMenu.Root>
</Sidebar.MenuItem>
diff --git a/frontend/src/lib/components/sidebar/sidebar-logo.svelte b/frontend/src/lib/components/sidebar/sidebar-logo.svelte
index 5f4bd9683..7ac59f130 100644
--- a/frontend/src/lib/components/sidebar/sidebar-logo.svelte
+++ b/frontend/src/lib/components/sidebar/sidebar-logo.svelte
@@ -9,7 +9,7 @@
<div
class={cn(
'border-border/30 flex h-16 items-center border-b transition-all duration-300',
- isCollapsed ? 'justify-center px-2' : 'gap-3 px-6'
+ isCollapsed ? 'justify-center px-2' : 'gap-3 px-4'
)}
>
<div class="relative flex shrink-0 items-center justify-center">
diff --git a/frontend/src/lib/components/sidebar/sidebar-pin-button.svelte b/frontend/src/lib/components/sidebar/sidebar-pin-button.svelte
new file mode 100644
index 000000000..da356a058
--- /dev/null
+++ b/frontend/src/lib/components/sidebar/sidebar-pin-button.svelte
@@ -0,0 +1,53 @@
+<script lang="ts">
+ import { Button } from '$lib/components/ui/button/index.js';
+ import { cn } from '$lib/utils.js';
+ import PinIcon from '@lucide/svelte/icons/pin';
+ import PinOffIcon from '@lucide/svelte/icons/pin-off';
+ import { useSidebar } from '$lib/components/ui/sidebar/context.svelte.js';
+
+ let {
+ ref = $bindable(null),
+ class: className,
+ ...restProps
+ }: {
+ ref?: HTMLElement | null;
+ class?: string;
+ [key: string]: any;
+ } = $props();
+
+ const sidebar = useSidebar();
+ const isPinned = $derived(sidebar.isPinned);
+</script>
+
+<Button
+ bind:ref
+ data-sidebar="pin-button"
+ data-slot="sidebar-pin-button"
+ variant="ghost"
+ size="icon"
+ class={cn('size-7 text-muted-foreground hover:text-foreground', className)}
+ type="button"
+ disabled={sidebar.isTablet}
+ title={isPinned ? 'Unpin sidebar' : 'Pin sidebar'}
+ onclick={(e) => {
+ e.preventDefault();
+ e.stopPropagation();
+ if (!sidebar.isTablet) {
+ // Always toggle the pinning preference
+ sidebar.toggle();
+ // Clear hover state when explicitly pinning/unpinning
+ if (sidebar.isHovered) {
+ sidebar.setHovered(false);
+ }
+ }
+ }}
+ {...restProps}
+>
+ {#if isPinned}
+ <PinOffIcon size={16} />
+ <span class="sr-only">Unpin sidebar</span>
+ {:else}
+ <PinIcon size={16} />
+ <span class="sr-only">Pin sidebar</span>
+ {/if}
+</Button>
diff --git a/frontend/src/lib/components/sidebar/sidebar-updatebanner.svelte b/frontend/src/lib/components/sidebar/sidebar-updatebanner.svelte
index a971d216f..b4d12473e 100644
--- a/frontend/src/lib/components/sidebar/sidebar-updatebanner.svelte
+++ b/frontend/src/lib/components/sidebar/sidebar-updatebanner.svelte
@@ -67,7 +67,7 @@
</div>
{/snippet}
</Tooltip.Trigger>
- <Tooltip.Content side="right" align="center" hidden={sidebar.state !== 'collapsed' || sidebar.isMobile}>
+ <Tooltip.Content side="right" align="center" hidden={sidebar.state !== 'collapsed' || sidebar.isMobile || sidebar.isHovered}>
{m.sidebar_update_available_tooltip({ version: versionInformation?.newestVersion ?? m.common_unknown() })}
</Tooltip.Content>
</Tooltip.Root>
diff --git a/frontend/src/lib/components/sidebar/sidebar-user.svelte b/frontend/src/lib/components/sidebar/sidebar-user.svelte
index e386a16fc..c7ce6f128 100644
--- a/frontend/src/lib/components/sidebar/sidebar-user.svelte
+++ b/frontend/src/lib/components/sidebar/sidebar-user.svelte
@@ -16,6 +16,14 @@
let { user, isCollapsed }: { user: User; isCollapsed: boolean } = $props();
const sidebar = useSidebar();
+ let dropdownOpen = $state(false);
+
+ $effect(() => {
+ if (sidebar.state === 'collapsed' && !sidebar.isHovered && dropdownOpen) {
+ dropdownOpen = false;
+ }
+ });
+
async function getGravatarUrl(email: string | undefined, size = 40): Promise<string> {
if (!email) return '';
@@ -31,15 +39,12 @@
<Sidebar.Menu>
<Sidebar.MenuItem>
- <DropdownMenu.Root>
+ <DropdownMenu.Root bind:open={dropdownOpen}>
<DropdownMenu.Trigger>
{#snippet child({ props })}
<Sidebar.MenuButton
size="lg"
- class={cn(
- 'data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground',
- !isCollapsed && 'w-full'
- )}
+ class="data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground"
{...props}
>
{#if user && user.displayName}
@@ -77,7 +82,17 @@
align="end"
sideOffset={12}
>
- <DropdownMenu.Label class="px-3 pb-2 pt-2 font-normal">
+ <div
+ onmouseenter={() => {
+ if (sidebar.state === 'collapsed') {
+ sidebar.setHovered(true);
+ }
+ }}
+ onmouseleave={() => {
+ sidebar.setHovered(false, 150);
+ }}
+ >
+ <DropdownMenu.Label class="px-3 pb-2 pt-2 font-normal">
<div class="flex items-center gap-3 text-left text-sm">
<Avatar.Root class="size-8 shrink-0 rounded-lg">
{#if $settingsStore.enableGravatar}
@@ -127,6 +142,7 @@
<span class="font-medium">{m.common_toggle_theme()}</span>
</Button.Root>
</DropdownMenu.Group>
+ </div>
</DropdownMenu.Content>
</DropdownMenu.Root>
</Sidebar.MenuItem>
diff --git a/frontend/src/lib/components/sidebar/sidebar.svelte b/frontend/src/lib/components/sidebar/sidebar.svelte
index 4e1f12764..e96dad64f 100644
--- a/frontend/src/lib/components/sidebar/sidebar.svelte
+++ b/frontend/src/lib/components/sidebar/sidebar.svelte
@@ -13,16 +13,16 @@
import type { AppVersionInformation } from '$lib/types/application-configuration';
import SidebarLogo from './sidebar-logo.svelte';
import SidebarUpdatebanner from './sidebar-updatebanner.svelte';
+ import SidebarPinButton from './sidebar-pin-button.svelte';
import userStore from '$lib/stores/user-store';
import { m } from '$lib/paraglide/messages';
import * as Button from '$lib/components/ui/button/index.js';
import LogOutIcon from '@lucide/svelte/icons/log-out';
- import LogInIcon from '@lucide/svelte/icons/log-in';
- import { cn } from '$lib/utils';
let {
ref = $bindable(null),
collapsible = 'icon',
+ variant = 'floating',
user,
versionInformation,
...restProps
@@ -40,13 +40,21 @@
});
const effectiveUser = $derived(user ?? storeUser);
- const isCollapsed = $derived(sidebar.state === 'collapsed');
+ const isCollapsed = $derived(sidebar.state === 'collapsed' && !sidebar.isHovered);
const isAdmin = $derived(!!effectiveUser?.roles?.includes('admin'));
</script>
-<Sidebar.Root {collapsible} {...restProps}>
+<Sidebar.Root {collapsible} {variant} {...restProps}>
<Sidebar.Header>
- <SidebarLogo {isCollapsed} {versionInformation} />
+ <div class="relative">
+ <SidebarLogo {isCollapsed} {versionInformation} />
+ <!-- Pin button positioned in top right, only visible when not collapsed or on hover -->
+ {#if !isCollapsed || sidebar.isHovered}
+ <div class="absolute top-0 right-0 -mt-1 -mr-1">
+ <SidebarPinButton />
+ </div>
+ {/if}
+ </div>
<SidebarEnvSwitcher {isAdmin} />
</Sidebar.Header>
<Sidebar.Content>
@@ -63,16 +71,6 @@
{#if isCollapsed}
<div class="px-0 pb-2">
<div class="flex flex-col items-center gap-2">
- <form action="/auth/logout" method="POST">
- <Button.Root
- variant="ghost"
- title={m.common_logout()}
- type="submit"
- class="text-muted-foreground hover:text-destructive hover:bg-destructive/10 h-9 w-9 rounded-xl p-0"
- >
- <LogOutIcon size={16} />
- </Button.Root>
- </form>
<SidebarUser {isCollapsed} user={effectiveUser} />
</div>
</div>
@@ -95,5 +93,4 @@
{/if}
{/if}
</Sidebar.Footer>
- <Sidebar.Rail />
</Sidebar.Root>
diff --git a/frontend/src/lib/components/ui/sidebar/context.svelte.ts b/frontend/src/lib/components/ui/sidebar/context.svelte.ts
index 6fa2aa317..af2e28998 100644
--- a/frontend/src/lib/components/ui/sidebar/context.svelte.ts
+++ b/frontend/src/lib/components/ui/sidebar/context.svelte.ts
@@ -1,5 +1,7 @@
import { IsMobile } from '$lib/hooks/is-mobile.svelte.js';
+import { IsTablet } from '$lib/hooks/is-tablet.svelte.js';
import { getContext, setContext } from 'svelte';
+import { PersistedState } from 'runed';
import { SIDEBAR_KEYBOARD_SHORTCUT } from './constants.js';
type Getter<T> = () => T;
@@ -26,12 +28,32 @@ class SidebarState {
openMobile = $state(false);
setOpen: SidebarStateProps['setOpen'];
#isMobile: IsMobile;
+ #isTablet: IsTablet;
+ #isPinnedState = new PersistedState('sidebar-pinned', true);
+ #isHovered = $state(false);
+ #hoverTimeout: ReturnType<typeof setTimeout> | null = null;
state = $derived.by(() => (this.open ? 'expanded' : 'collapsed'));
constructor(props: SidebarStateProps) {
this.setOpen = props.setOpen;
this.#isMobile = new IsMobile();
+ this.#isTablet = new IsTablet();
this.props = props;
+
+ // Sync the open state based on pinning preference and screen size
+ $effect(() => {
+ // On tablet and mobile, always collapse regardless of pinning preference
+ if (this.#isTablet.current || this.#isMobile.current) {
+ if (this.open) {
+ this.setOpen(false);
+ }
+ } else {
+ // On desktop, respect the pinning preference
+ if (this.open !== this.#isPinnedState.current) {
+ this.setOpen(this.#isPinnedState.current);
+ }
+ }
+ });
}
// Convenience getter for checking if the sidebar is mobile
@@ -40,11 +62,62 @@ class SidebarState {
return this.#isMobile.current;
}
+ // Convenience getter for checking if the screen is tablet size
+ get isTablet() {
+ return this.#isTablet.current;
+ }
+
+ // Getter for hover state
+ get isHovered() {
+ return this.#isHovered;
+ }
+
+ // Getter for pinning preference
+ get isPinned() {
+ return this.#isPinnedState.current;
+ }
+
+ // 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 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);
+ }
+
+ // Set hover state with optional delay for clearing
+ setHovered = (value: boolean, delay = 0) => {
+ // Clear any existing timeout
+ if (this.#hoverTimeout !== null) {
+ clearTimeout(this.#hoverTimeout);
+ this.#hoverTimeout = null;
+ }
+
+ if (value) {
+ // Immediately set hover to true
+ this.#isHovered = true;
+ } else if (delay > 0) {
+ // Delay clearing hover state
+ this.#hoverTimeout = setTimeout(() => {
+ this.#isHovered = false;
+ this.#hoverTimeout = null;
+ }, delay);
+ } else {
+ // Immediately clear hover state
+ this.#isHovered = false;
+ }
+ };
+
// Event handler to apply to the `<svelte:window>`
handleShortcutKeydown = (e: KeyboardEvent) => {
if (e.key === SIDEBAR_KEYBOARD_SHORTCUT && (e.metaKey || e.ctrlKey)) {
e.preventDefault();
- this.toggle();
+ // Don't allow keyboard toggle in tablet mode
+ if (!this.#isTablet.current) {
+ this.toggle();
+ }
}
};
@@ -53,7 +126,16 @@ class SidebarState {
};
toggle = () => {
- return this.#isMobile.current ? (this.openMobile = !this.openMobile) : this.setOpen(!this.open);
+ if (this.#isMobile.current) {
+ return this.openMobile = !this.openMobile;
+ } else if (this.#isTablet.current) {
+ // In tablet mode, sidebar should stay collapsed - no toggle allowed
+ return;
+ } else {
+ // On desktop, toggle the pinning preference
+ this.#isPinnedState.current = !this.#isPinnedState.current;
+ return this.setOpen(this.#isPinnedState.current);
+ }
};
}
@@ -77,3 +159,4 @@ export function setSidebar(props: SidebarStateProps): SidebarState {
export function useSidebar(): SidebarState {
return getContext(Symbol.for(SYMBOL_KEY));
}
+
diff --git a/frontend/src/lib/components/ui/sidebar/sidebar-content.svelte b/frontend/src/lib/components/ui/sidebar/sidebar-content.svelte
index 0be73d234..9b4a0dd8c 100644
--- a/frontend/src/lib/components/ui/sidebar/sidebar-content.svelte
+++ b/frontend/src/lib/components/ui/sidebar/sidebar-content.svelte
@@ -9,7 +9,7 @@
bind:this={ref}
data-slot="sidebar-content"
data-sidebar="content"
- class={cn('flex min-h-0 flex-1 flex-col gap-2 overflow-auto group-data-[collapsible=icon]:overflow-hidden', className)}
+ 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', className)}
{...restProps}
>
{@render children?.()}
diff --git a/frontend/src/lib/components/ui/sidebar/sidebar-group-action.svelte b/frontend/src/lib/components/ui/sidebar/sidebar-group-action.svelte
index 929993ee1..542a0fb1d 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]:hidden group-data-[collapsible=icon]:group-data-[hovered=true]:flex',
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.svelte
index 1de5e8473..c50b0fa67 100644
--- a/frontend/src/lib/components/ui/sidebar/sidebar-group-label.svelte
+++ b/frontend/src/lib/components/ui/sidebar/sidebar-group-label.svelte
@@ -16,7 +16,7 @@
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]:-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',
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.svelte
index 3f178c8f5..f68c819ab 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]:hidden group-data-[collapsible=icon]:group-data-[hovered=true]:flex',
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',
className
diff --git a/frontend/src/lib/components/ui/sidebar/sidebar-menu-badge.svelte b/frontend/src/lib/components/ui/sidebar/sidebar-menu-badge.svelte
index fa867a460..ad032035f 100644
--- a/frontend/src/lib/components/ui/sidebar/sidebar-menu-badge.svelte
+++ b/frontend/src/lib/components/ui/sidebar/sidebar-menu-badge.svelte
@@ -15,7 +15,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]:hidden group-data-[collapsible=icon]:group-data-[hovered=true]:flex',
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.svelte
index c358b7082..dada96789 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! 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! 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',
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'
+ 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!'
}
},
defaultVariants: {
@@ -88,7 +88,7 @@
<Tooltip.Content
side="right"
align="center"
- hidden={sidebar.state !== 'collapsed' || sidebar.isMobile}
+ hidden={sidebar.state !== 'collapsed' || sidebar.isMobile || 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.svelte
index 95191c2a3..83a6d3c55 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]:hidden group-data-[collapsible=icon]:group-data-[hovered=true]:flex',
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.svelte
index 620ea999c..c8858d4da 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]:hidden group-data-[collapsible=icon]:group-data-[hovered=true]:flex',
className
)}
{...restProps}
diff --git a/frontend/src/lib/components/ui/sidebar/sidebar-provider.svelte b/frontend/src/lib/components/ui/sidebar/sidebar-provider.svelte
index 461f43774..dfde865cf 100644
--- a/frontend/src/lib/components/ui/sidebar/sidebar-provider.svelte
+++ b/frontend/src/lib/components/ui/sidebar/sidebar-provider.svelte
@@ -1,13 +1,18 @@
<script lang="ts">
- import * as Tooltip from '$lib/components/ui/tooltip/index.js';
- import { cn, type WithElementRef } from '$lib/utils.js';
- import type { HTMLAttributes } from 'svelte/elements';
- import { SIDEBAR_COOKIE_MAX_AGE, SIDEBAR_COOKIE_NAME, SIDEBAR_WIDTH, SIDEBAR_WIDTH_ICON } from './constants.js';
- import { setSidebar } from './context.svelte.js';
+import * as Tooltip from '$lib/components/ui/tooltip/index.js';
+import { cn, type WithElementRef } from '$lib/utils.js';
+import type { HTMLAttributes } from 'svelte/elements';
+import { SIDEBAR_COOKIE_MAX_AGE, SIDEBAR_COOKIE_NAME, SIDEBAR_WIDTH, SIDEBAR_WIDTH_ICON } from './constants.js';
+import { setSidebar } from './context.svelte.js';
+import { IsTablet } from '$lib/hooks/is-tablet.svelte.js';
+import { IsMobile } from '$lib/hooks/is-mobile.svelte.js';
+import { PersistedState } from 'runed';
+
+ const persistedPinned = new PersistedState('sidebar-pinned', true);
let {
ref = $bindable(null),
- open = $bindable(true),
+ open = $bindable(persistedPinned.current),
onOpenChange = () => {},
class: className,
style,
@@ -18,9 +23,34 @@
onOpenChange?: (open: boolean) => void;
} = $props();
+ // Initialize breakpoint detection utilities
+ const isTablet = new IsTablet();
+ const isMobile = new IsMobile();
+ let initialAdjustmentDone = $state(false);
+
+ // Set initial state based on screen size (only runs once)
+ $effect(() => {
+ if (!initialAdjustmentDone) {
+ // On tablet screens (but not mobile), force collapse the sidebar
+ if (isTablet.current && !isMobile.current) {
+ open = false;
+ }
+ // On desktop screens (1024px and above), auto-expand the sidebar
+ else if (!isTablet.current && !isMobile.current && !open) {
+ open = true;
+ }
+ initialAdjustmentDone = true;
+ }
+ });
+
const sidebar = setSidebar({
open: () => open,
setOpen: (value: boolean) => {
+ // Don't allow expanding sidebar on tablet screens
+ if (isTablet.current && !isMobile.current && value === true) {
+ return;
+ }
+
open = value;
onOpenChange(value);
diff --git a/frontend/src/lib/components/ui/sidebar/sidebar-rail.svelte b/frontend/src/lib/components/ui/sidebar/sidebar-rail.svelte
index 220f62e5b..1d739cb1e 100644
--- a/frontend/src/lib/components/ui/sidebar/sidebar-rail.svelte
+++ b/frontend/src/lib/components/ui/sidebar/sidebar-rail.svelte
@@ -18,14 +18,32 @@
data-sidebar="rail"
data-slot="sidebar-rail"
aria-label="Toggle Sidebar"
- tabIndex={-1}
- onclick={sidebar.toggle}
- title="Toggle Sidebar"
+ 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();
+ }
+ }
+ }}
+ title={sidebar.isTablet ? '' : 'Toggle Sidebar'}
class={cn(
- 'hover:after:bg-sidebar-border 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',
- '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',
+ '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',
+ // 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'
+ ],
'[[data-side=left][data-collapsible=offcanvas]_&]:-right-2',
'[[data-side=right][data-collapsible=offcanvas]_&]:-left-2',
className
diff --git a/frontend/src/lib/components/ui/sidebar/sidebar-trigger.svelte b/frontend/src/lib/components/ui/sidebar/sidebar-trigger.svelte
index 43a742079..3318d2c51 100644
--- a/frontend/src/lib/components/ui/sidebar/sidebar-trigger.svelte
+++ b/frontend/src/lib/components/ui/sidebar/sidebar-trigger.svelte
@@ -29,10 +29,12 @@
size="icon"
class={cn('size-7', className)}
type="button"
- {disabled}
+ disabled={disabled || sidebar.isTablet}
onclick={(e) => {
onclick?.(e);
- sidebar.toggle();
+ if (!sidebar.isTablet) {
+ sidebar.toggle();
+ }
}}
{...restProps}
>
diff --git a/frontend/src/lib/components/ui/sidebar/sidebar.svelte b/frontend/src/lib/components/ui/sidebar/sidebar.svelte
index 909abeaa0..fd3ec3405 100644
--- a/frontend/src/lib/components/ui/sidebar/sidebar.svelte
+++ b/frontend/src/lib/components/ui/sidebar/sidebar.svelte
@@ -31,7 +31,7 @@
{@render children?.()}
</div>
{:else if sidebar.isMobile}
- <Sheet.Root bind:open={() => sidebar.openMobile, (v) => sidebar.setOpenMobile(v)} {...restProps}>
+ <Sheet.Root bind:open={sidebar.openMobile} onOpenChange={sidebar.setOpenMobile} {...restProps}>
<Sheet.Content
data-sidebar="sidebar"
data-slot="sidebar"
@@ -57,6 +57,7 @@
data-collapsible={sidebar.state === 'collapsed' ? collapsible : ''}
data-variant={variant}
data-side={side}
+ data-hovered={sidebar.isHovered ? 'true' : 'false'}
data-slot="sidebar"
>
<!-- This is what handles the sidebar gap on desktop -->
@@ -74,7 +75,7 @@
<div
data-slot="sidebar-container"
class={cn(
- 'fixed inset-y-0 z-10 hidden h-svh w-(--sidebar-width) transition-[left,right,width] duration-200 ease-linear md:flex',
+ 'fixed inset-y-0 z-10 hidden h-svh w-(--sidebar-width) transition-[left,right,width] duration-200 ease-linear md:flex overflow-x-hidden',
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)]',
@@ -82,14 +83,25 @@
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',
className
)}
+ onmouseenter={() => {
+ if (sidebar.state === 'collapsed') {
+ sidebar.setHovered(true);
+ }
+ }}
+ onmouseleave={() => {
+ sidebar.setHovered(false, 150);
+ }}
{...restProps}
>
<div
data-sidebar="sidebar"
data-slot="sidebar-inner"
- class="bg-sidebar group-data-[variant=floating]:border-sidebar-border flex h-full w-full flex-col group-data-[variant=floating]:rounded-lg group-data-[variant=floating]:border group-data-[variant=floating]:shadow-sm"
+ class="bg-sidebar group-data-[variant=floating]:border-sidebar-border flex h-full w-full flex-col overflow-x-hidden group-data-[variant=floating]:rounded-lg group-data-[variant=floating]:border group-data-[variant=floating]:shadow-sm"
>
{@render children?.()}
</div>
diff --git a/frontend/src/lib/hooks/is-tablet.svelte.ts b/frontend/src/lib/hooks/is-tablet.svelte.ts
new file mode 100644
index 000000000..dace7eba3
--- /dev/null
+++ b/frontend/src/lib/hooks/is-tablet.svelte.ts
@@ -0,0 +1,10 @@
+import { MediaQuery } from 'svelte/reactivity';
+
+// Breakpoint for tablet/small desktop where sidebar should auto-collapse
+const TABLET_BREAKPOINT = 1024;
+
+export class IsTablet extends MediaQuery {
+ constructor() {
+ super(`max-width: ${TABLET_BREAKPOINT - 1}px`);
+ }
+}